Merge branch 'master' into notes

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 528907d16b9d1ab6c4c1cfeb25d79cd689e27c06..2089c2289ecaafc6cd704571643df657b346727b 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -3,8 +3,8 @@ class NotesController < ApplicationController
   layout 'site', :only => [:mine]
 
   before_filter :check_api_readable
-  before_filter :authorize_web, :only => [:create, :close, :update, :delete, :mine]
-  before_filter :check_api_writable, :only => [:create, :close, :update, :delete]
+  before_filter :authorize_web, :only => [:create, :comment, :close, :destroy, :mine]
+  before_filter :check_api_writable, :only => [:create, :comment, :close, :destroy]
   before_filter :set_locale, :only => [:mine]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
@@ -131,6 +131,7 @@ 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
@@ -142,7 +143,7 @@ class NotesController < ApplicationController
     Note.transaction do
       @note.close
 
-      add_comment(@note, nil, name, "closed")
+      add_comment(@note, comment, name, "closed")
     end
 
     # Return a copy of the updated note