Rename comments_feed to index

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

diff --git a/app/controllers/changeset_comments_controller.rb b/app/controllers/changeset_comments_controller.rb
index 31e152560af73d8fe0353a41fc6141822044a8b8..856b12f20e587063c24f80271e41d31c012c6c66 100644 (file)
--- a/app/controllers/changeset_comments_controller.rb
+++ b/app/controllers/changeset_comments_controller.rb
@@ -1,20 +1,20 @@
 class ChangesetCommentsController < ApplicationController
-  before_action :authorize_web, :only => [:comments_feed]
-  before_action :set_locale, :only => [:comments_feed]
-  before_action :authorize, :only => [:comment, :hide_comment, :unhide_comment]
+  before_action :authorize_web, :only => [:index]
+  before_action :set_locale, :only => [:index]
+  before_action :authorize, :only => [:create, :hide_comment, :unhide_comment]
   before_action :require_moderator, :only => [:hide_comment, :unhide_comment]
-  before_action :require_allow_write_api, :only => [:comment, :hide_comment, :unhide_comment]
-  before_action :require_public_data, :only => [:comment]
-  before_action :check_api_writable, :only => [:comment, :hide_comment, :unhide_comment]
-  before_action :check_api_readable, :except => [:comment, :comments_feed]
-  before_action(:only => [:comments_feed]) { |c| c.check_database_readable(true) }
-  around_action :api_call_handle_error, :except => [:comments_feed]
-  around_action :api_call_timeout, :except => [:comments_feed]
-  around_action :web_timeout, :only => [:comments_feed]
+  before_action :require_allow_write_api, :only => [:create, :hide_comment, :unhide_comment]
+  before_action :require_public_data, :only => [:create]
+  before_action :check_api_writable, :only => [:create, :hide_comment, :unhide_comment]
+  before_action :check_api_readable, :except => [:create, :index]
+  before_action(:only => [:index]) { |c| c.check_database_readable(true) }
+  around_action :api_call_handle_error, :except => [:index]
+  around_action :api_call_timeout, :except => [:index]
+  around_action :web_timeout, :only => [:index]
 
   ##
   # Add a comment to a changeset
-  def comment
+  def create
     # Check the arguments are sane
     raise OSM::APIBadUserInput, "No id was given" unless params[:id]
     raise OSM::APIBadUserInput, "No text was given" if params[:text].blank?
@@ -84,7 +84,7 @@ class ChangesetCommentsController < ApplicationController
 
   ##
   # Get a feed of recent changeset comments
-  def comments_feed
+  def index
     if params[:id]
       # Extract the arguments
       id = params[:id].to_i