Add support for OAuth2 using doorkeeper

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

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index a73240e5fabc4f849780cbcb9e2dd42a26c30352..f480b9706102c9a549bc770b5c7064b6fdaa7253 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class NotesController < ApiController
 module Api
   class NotesController < ApiController

-    layout "site", :only => [:mine]
-

     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]


@@ -242,7 +240,7 @@ module Api
         @note.status = "hidden"
         @note.save
 
         @note.status = "hidden"
         @note.save
 

-        add_comment(@note, comment, "hidden", false)
+        add_comment(@note, comment, "hidden", :notify => false)

       end
 
       # Return a copy of the updated note
       end
 
       # Return a copy of the updated note


@@ -371,7 +369,7 @@ module Api
 
     ##
     # Add a comment to a note
 
     ##
     # Add a comment to a note

-    def add_comment(note, text, event, notify = true)
+    def add_comment(note, text, event, notify: true)

       attributes = { :visible => true, :event => event, :body => text }
 
       if current_user
       attributes = { :visible => true, :event => event, :body => text }
 
       if current_user


@@ -383,7 +381,7 @@ module Api
       comment = note.comments.create!(attributes)
 
       note.comments.map(&:author).uniq.each do |user|
       comment = note.comments.create!(attributes)
 
       note.comments.map(&:author).uniq.each do |user|

-        Notifier.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?
+        UserMailer.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?

       end
     end
   end
       end
     end
   end