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

[rails.git] / app / views / changesets / show.html.erb

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index a47049e999620a70effb50d2d5edb0a30db41229..70b1877b5a0bb4789001e5d2ef9ebdb4a470f502 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -6,7 +6,9 @@
   <p class="fs-6 overflow-x-auto">
     <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
   </p>
   <p class="fs-6 overflow-x-auto">
     <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
   </p>

-  <p class="details"><%= changeset_details(@changeset) %></p>
+  <%= tag.p :class => "details", :data => { :changeset => changeset_data(@changeset) } do %>
+    <%= changeset_details(@changeset) %>
+  <% end %>

 
   <%= render :partial => "browse/tag_details", :object => @changeset.tags.except("comment") %>
 
 
   <%= render :partial => "browse/tag_details", :object => @changeset.tags.except("comment") %>
 


@@ -47,8 +49,8 @@
               —
               <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),
                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
               —
               <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),
                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",

-                             :data => { :method => "POST",
-                                        :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>
+                             :data => { :method => comment.visible ? "DELETE" : "POST",
+                                        :url => api_changeset_comment_visibility_path(comment) } %>

             <% end %>
           </small>
           <div class="mx-2">
             <% end %>
           </small>
           <div class="mx-2">


@@ -79,7 +81,7 @@
                          :name => "comment",
                          :disabled => true,
                          :data => { :method => "POST",
                          :name => "comment",
                          :disabled => true,
                          :data => { :method => "POST",

-                                    :url => changeset_comment_url(@changeset) } %>
+                                    :url => api_changeset_changeset_comments_path(@changeset) } %>

         </div>
       </form>
     <% else %>
         </div>
       </form>
     <% else %>


@@ -103,9 +105,9 @@
 </div>
 
 <div class='secondary-actions'>
 </div>
 
 <div class='secondary-actions'>

-  <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
+  <%= link_to t(".changesetxml"), api_changeset_path(@changeset) %>

   &middot;
   &middot;

-  <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>
+  <%= link_to t(".osmchangexml"), api_changeset_download_path(@changeset) %>

 </div>
 
 <% if @next_by_user || @prev_by_user %>
 </div>
 
 <% if @next_by_user || @prev_by_user %>