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

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

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 63ab89b8f376006a7a52f348648dbd19da5811f9..6c0895380d55d0c0e2024c15a00164a3a33110d1 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -13,15 +13,15 @@
 <%= render @entry %>
 
 <div id="comments" class="comments mb-3 overflow-hidden">
 <%= render @entry %>
 
 <div id="comments" class="comments mb-3 overflow-hidden">

-  <div class="row border-bottom border-grey">
+  <div class="row border-bottom border-secondary-subtle">

     <h2 class="col"><%= t(".discussion") %></h2>
 
     <% if current_user %>
       <div class="col-auto">
         <% if @entry.subscribers.exists?(current_user.id) %>
     <h2 class="col"><%= t(".discussion") %></h2>
 
     <% if current_user %>
       <div class="col-auto">
         <% if @entry.subscribers.exists?(current_user.id) %>

-          <%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+          <%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>

         <% else %>
         <% else %>

-          <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+          <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(@entry.user, @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>

         <% end %>
       </div>
     <% end %>
         <% end %>
       </div>
     <% end %>