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

tomhughes · Apr 1, 2024 · 0aee844 · 0aee844
2 parents 4087f39 + 558c876
commit 0aee844
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
@@ -42,7 +42,7 @@ def create
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "api/changesets/changeset"
+      render "api/changesets/show"
 
       respond_to do |format|
         format.xml
@@ -67,7 +67,7 @@ def destroy
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
-      render "api/changesets/changeset"
+      render "api/changesets/show"
 
       respond_to do |format|
         format.xml
@@ -92,7 +92,7 @@ def restore
 
       # Return a copy of the updated changeset
       @changeset = comment.changeset
-      render "api/changesets/changeset"
+      render "api/changesets/show"
 
       respond_to do |format|
         format.xml

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
@@ -28,7 +28,6 @@ def show
         @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
@@ -198,7 +197,7 @@ def update
 
       check_changeset_consistency(@changeset, current_user)
       @changeset.update_from(new_changeset, current_user)
-      render "changeset"
+      render "show"
 
       respond_to do |format|
         format.xml
@@ -224,7 +223,7 @@ def subscribe
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "changeset"
+      render "show"
 
       respond_to do |format|
         format.xml
@@ -250,7 +249,7 @@ def unsubscribe
 
       # Return a copy of the updated changeset
       @changeset = changeset
-      render "changeset"
+      render "show"
 
       respond_to do |format|
         format.xml

diff --git a/...ws/api/changesets/changeset.json.jbuilder → app/views/api/changesets/show.json.jbuilder b/...ws/api/changesets/changeset.json.jbuilder → app/views/api/changesets/show.json.jbuilder
diff --git a/...iews/api/changesets/changeset.xml.builder → app/views/api/changesets/show.xml.builder b/...iews/api/changesets/changeset.xml.builder → app/views/api/changesets/show.xml.builder