Merge remote-tracking branch 'upstream/pull/5278'

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

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index 4a96ec3bbaef00087e8b03a464c7ee78e65c56c2..808ac97ea3418257445177caeb8615cc2574ff78 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -1,14 +1,24 @@
 module Api
   class ChangesetCommentsController < ApiController
 module Api
   class ChangesetCommentsController < ApiController

-    before_action :check_api_writable
-    before_action :authorize
+    include QueryMethods
+
+    before_action :check_api_writable, :except => [:index]
+    before_action :authorize, :except => [:index]

 
     authorize_resource
 
     before_action :require_public_data, :only => [:create]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create]

+

     before_action :set_request_formats
     before_action :set_request_formats

-    around_action :api_call_handle_error
-    around_action :api_call_timeout
+
+    ##
+    # show all comments or search for a subset
+    def index
+      @comments = ChangesetComment.includes(:author).where(:visible => true).order("created_at DESC")
+      @comments = query_conditions_time(@comments)
+      @comments = query_conditions_user(@comments, :author)
+      @comments = query_limit(@comments)
+    end

 
     ##
     # Add a comment to a changeset
 
     ##
     # Add a comment to a changeset