Allow an optional comment to be given when closing a note

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index fe3615d7a0965e4290a21b5eb47fc00c9203ac63..bf9d0187fd00c9896b08a7f8246fef41301d0ce1 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -87,8 +87,11 @@ class NotesController < ApplicationController
       add_comment(@note, comment, name, "opened")
     end
 
-    # Send an OK response
-    render_ok
+    # Return a copy of the new note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end
   end
 
   ##
@@ -104,17 +107,20 @@ class NotesController < ApplicationController
     name = params[:name] or "NoName"
 
     # Find the note and check it is valid
-    note = Note.find(id)
-    raise OSM::APINotFoundError unless note
-    raise OSM::APIAlreadyDeletedError unless note.visible?
+    @note = Note.find(id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError unless @note.visible?
 
     # Add a comment to the note
     Note.transaction do
-      add_comment(note, comment, name, "commented")
+      add_comment(@note, comment, name, "commented")
     end
 
-    # Send an OK response
-    render_ok
+    # Return a copy of the updated note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end
   end
 
   ##
@@ -125,22 +131,26 @@ class NotesController < ApplicationController
 
     # Extract the arguments
     id = params[:id].to_i
+    comment = params[:text]
     name = params[:name]
 
     # Find the note and check it is valid
-    note = Note.find_by_id(id)
-    raise OSM::APINotFoundError unless note
-    raise OSM::APIAlreadyDeletedError unless note.visible?
+    @note = Note.find_by_id(id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError unless @note.visible?
 
     # Close the note and add a comment
     Note.transaction do
-      note.close
+      @note.close
 
-      add_comment(note, nil, name, "closed")
+      add_comment(@note, comment, name, "closed")
     end
 
-    # Send an OK response
-    render_ok
+    # Return a copy of the updated note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end
   end 
 
   ##
@@ -319,11 +329,11 @@ private
       attributes[:author_name] = name + " (a)"
     end
 
-    note.comments.create(attributes, :without_protection => true)
+    comment = note.comments.create(attributes, :without_protection => true)
 
     note.comments.map { |c| c.author }.uniq.each do |user|
       if user and user != @user
-        Notifier.deliver_note_comment_notification(comment, user)
+        Notifier.note_comment_notification(comment, user).deliver
       end
     end
   end