Skip to content

Commit 5ab37c0

Browse files
author
travis
committed
Max reports included
1 parent e39b9e8 commit 5ab37c0

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

app/views/spent_time/_javascript_report.html.erb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@
6969
}
7070

7171
});
72+
73+
<% if @issue.time_entries.count > Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i %>
74+
time_entries += '<div class="spenttimeentry '+toggle+'">'
75+
time_entries += '<%=raw link_to "#{t "plugin_spent_time_in_issue.seeAllCount", count: @issue.time_entries.count}", issue_time_entries_path( @issue ) %>'
76+
time_entries += '</div>'
77+
<% end %>
78+
7279
time_entries += '</div>'
7380

7481
<% if @issue.changesets.present? and Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "below_revisions" %>

app/views/spent_time/_report.html.erb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<% if User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? and (Setting.plugin_redmine_spent_time_in_issue_description['report_location'].eql? "ticket_body" or Setting.plugin_redmine_spent_time_in_issue_description['report_location'].nil? )%>
22

33
<hr />
4-
<p><strong><%= t('plugin_spent_time_in_issue.timeEntries') %></strong> <%= link_to "#{t "plugin_spent_time_in_issue.seeAllCount", count: @issue.time_entries.count}", project_issue_time_entries_path( @project , @issue ) if @issue.time_entries.count > Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i %> </p>
4+
<p>
5+
<strong><%= t('plugin_spent_time_in_issue.timeEntries') %></strong>
6+
<% if @issue.time_entries.count > Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i %>
7+
<%= link_to "#{t "plugin_spent_time_in_issue.seeAllCount", count: @issue.time_entries.count}", issue_time_entries_path( @issue ) %>
8+
<% end %>
9+
</p>
510

611
<table class="issue-spent-time-description">
712
<thead>

0 commit comments

Comments
 (0)