diff options
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_history.html.erb | 5 | ||||
| -rw-r--r-- | app/views/issues/show.html.erb | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb index 297771d7d..6571bea45 100644 --- a/app/views/issues/_history.html.erb +++ b/app/views/issues/_history.html.erb @@ -1,3 +1,8 @@ +<% + issue = tab[:locals][:issue] + journals = tab[:locals][:journals] +%> + <% reply_links = issue.notes_addable? -%> <% for journal in journals %> <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>"> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 6c0018f24..3a17cc49a 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -129,12 +129,12 @@ end %> </div> <% end %> -<% if @journals.present? %> +<%= render partial: 'action_menu_edit' if User.current.wants_comments_in_reverse_order? %> + <div id="history"> <h3><%=l(:label_history)%></h3> -<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %> +<%= render_tabs issue_history_tabs, params[:tab] ? params[:tab] : 'notes' %> </div> -<% end %> <%= render partial: 'action_menu_edit' unless User.current.wants_comments_in_reverse_order? %> |