HTMLize note browse pages

[rails.git] / app / controllers / notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index b25dc9a9ed777e18e0c2f5bc13cb2efec8320211..e037a48c9c596d7f8808c0db6c078c46798481b7 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -6,8 +6,10 @@ class NotesController < ApplicationController
   before_filter :authorize_web, :only => [:mine]
   before_filter :setup_user_auth, :only => [:create, :comment]
   before_filter :authorize, :only => [:close, :destroy]
   before_filter :authorize_web, :only => [:mine]
   before_filter :setup_user_auth, :only => [:create, :comment]
   before_filter :authorize, :only => [:close, :destroy]

+  before_filter :require_moderator, :only => [:destroy]

   before_filter :check_api_writable, :only => [:create, :comment, :close, :destroy]
   before_filter :check_api_writable, :only => [:create, :comment, :close, :destroy]

-  before_filter :set_locale, :only => [:mine]
+  before_filter :require_allow_write_notes, :only => [:create, :comment, :close, :destroy]
+  before_filter :set_locale

   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 


@@ -193,22 +195,26 @@ class NotesController < ApplicationController
 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i

+    comment = params[:text]

 
     # Find the note and check it is valid
 
     # Find the note and check it is valid

-    note = Note.find(id)
-    raise OSM::APINotFoundError unless note
-    raise OSM::APIAlreadyDeletedError.new("note", note.id) unless note.visible?
+    @note = Note.find(id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?

 
     # Mark the note as hidden
     Note.transaction do
 
     # Mark the note as hidden
     Note.transaction do

-      note.status = "hidden"
-      note.save
+      @note.status = "hidden"
+      @note.save

 
 

-      add_comment(note, nil, "hidden")
+      add_comment(@note, comment, "hidden")

     end
 
     end
 

-    # Render the result
-    render :text => "ok\n", :content_type => "text/html" 
+    # Return a copy of the updated note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end

   end
 
   ##
   end
 
   ##