Rename api changeset show template

Make template name correspond to action name.

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index bb77e1106609b2cea7b0190a61fcb160fd4032b0..756e56dccdfb706d8d6e7c4456683fcc232eb08c 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -42,7 +42,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
 
       # Return a copy of the updated changeset
       @changeset = changeset

-      render "api/changesets/changeset"
+      render "api/changesets/show"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml


@@ -67,7 +67,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset

-      render "api/changesets/changeset"
+      render "api/changesets/show"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml


@@ -92,7 +92,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset

-      render "api/changesets/changeset"
+      render "api/changesets/show"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 78a5b48e3ff6025e0a9f4f81576ea14e4e6487b1..2bca8813a0f04ddee75c24b91e5f8ca4924f98d6 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -28,7 +28,6 @@ module Api
         @comments = @comments.unscope(:where => :visible) if params[:show_hidden_comments].presence && can?(:restore, ChangesetComment)
         @comments = @comments.includes(:author)
       end
         @comments = @comments.unscope(:where => :visible) if params[:show_hidden_comments].presence && can?(:restore, ChangesetComment)
         @comments = @comments.includes(:author)
       end

-      render "changeset"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml


@@ -198,7 +197,7 @@ module Api
 
       check_changeset_consistency(@changeset, current_user)
       @changeset.update_from(new_changeset, current_user)
 
       check_changeset_consistency(@changeset, current_user)
       @changeset.update_from(new_changeset, current_user)

-      render "changeset"
+      render "show"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml


@@ -224,7 +223,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
 
       # Return a copy of the updated changeset
       @changeset = changeset

-      render "changeset"
+      render "show"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml


@@ -250,7 +249,7 @@ module Api
 
       # Return a copy of the updated changeset
       @changeset = changeset
 
       # Return a copy of the updated changeset
       @changeset = changeset

-      render "changeset"
+      render "show"

 
       respond_to do |format|
         format.xml
 
       respond_to do |format|
         format.xml

diff --git a/app/views/api/changesets/changeset.json.jbuilder b/app/views/api/changesets/show.json.jbuilder
similarity index 100%
rename from app/views/api/changesets/changeset.json.jbuilder
rename to app/views/api/changesets/show.json.jbuilder

diff --git a/app/views/api/changesets/changeset.xml.builder b/app/views/api/changesets/show.xml.builder
similarity index 100%
rename from app/views/api/changesets/changeset.xml.builder
rename to app/views/api/changesets/show.xml.builder