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

diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index a04cbf9d9b215dee8fa5da9578bc27a0ef398c6c..17a6651cf684b3f81b39bfa365911cd60c8d4056 100644 (file)
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -79,10 +79,14 @@
       </div>
       <div class="d-flex flex-wrap gap-1">
         <% if @note.status != "hidden" and current_user and current_user.moderator? -%>
-          <input type="submit" name="hide" value="<%= t(".hide") %>" class="btn btn-light" data-method="DELETE" data-url="<%= api_note_url(@note, "json") %>">
+          <%= submit_tag t(".hide"), :name => "hide", :class => "btn btn-light",
+                                     :data => { :method => "DELETE",
+                                                :url => api_note_url(@note, "json") } %>
         <% end -%>
         <% if current_user -%>
-          <input type="submit" name="reopen" value="<%= t(".reactivate") %>" class="btn btn-primary" data-method="POST" data-url="<%= reopen_api_note_url(@note, "json") %>">
+          <%= submit_tag t(".reactivate"), :name => "reopen", :class => "btn btn-primary",
+                                           :data => { :method => "POST",
+                                                      :url => reopen_api_note_url(@note, "json") } %>
         <% end -%>
       </div>
     </form>