summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2018-04-25 12:43:33 +0100
committerbill-auger <mr.j.spam.me@gmail.com>2018-04-25 12:43:33 +0100
commit068529473dd75d310913392852705e816ddca834 (patch)
treeb7fc92c73bfa26092aff567f91c17f14ad1d014c
parent7827d9cdf8c0f198b776bcd88881a57d83390ee1 (diff)
add n_issues column to issue-statuses index viewissue-statuses-index-view
-rw-r--r--app/controllers/issue_statuses_controller.rb4
-rw-r--r--app/views/issue_statuses/index.html.erb10
-rw-r--r--config/locales/en.yml1
-rw-r--r--public/stylesheets/application.css1
4 files changed, 12 insertions, 4 deletions
diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb
index e49878f1d..c3416bece 100644
--- a/app/controllers/issue_statuses_controller.rb
+++ b/app/controllers/issue_statuses_controller.rb
@@ -24,6 +24,10 @@ class IssueStatusesController < ApplicationController
def index
@issue_statuses = IssueStatus.sorted.to_a
+ @issue_statuses.each do | issue_status |
+ @issue_statuses_n_issues[issue_status] = (Issue.where :status_id => issue_status.id).count
+ end
+
respond_to do |format|
format.html { render :layout => false if request.xhr? }
format.api
diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb
index 8608402ca..74f753171 100644
--- a/app/views/issue_statuses/index.html.erb
+++ b/app/views/issue_statuses/index.html.erb
@@ -7,11 +7,12 @@
<table class="list issue_statuses">
<thead><tr>
- <th><%=l(:field_status)%></th>
+ <th><%= l(:field_status) %></th>
<% if Issue.use_status_for_done_ratio? %>
- <th><%=l(:field_done_ratio)%></th>
+ <th><%= l(:field_done_ratio) %></th>
<% end %>
- <th><%=l(:field_is_closed)%></th>
+ <th><%= l(:field_issue_status_n_statuses) %></th>
+ <th><%= l(:field_is_closed) %></th>
<th></th>
</tr></thead>
<tbody>
@@ -21,7 +22,8 @@
<% if Issue.use_status_for_done_ratio? %>
<td><%= status.default_done_ratio %></td>
<% end %>
- <td><%= checked_image status.is_closed? %></td>
+ <td class="num"><%= @issue_statuses_n_issues[status] %></td>
+ <td class="tick"><%= checked_image status.is_closed? %></td>
<td class="buttons">
<%= reorder_handle(status) %>
<%= delete_link issue_status_path(status) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 399c2e85a..cb94df619 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -269,6 +269,7 @@ en:
field_issue: Issue
field_status: Status
field_notes: Notes
+ field_issue_status_n_statuses: Issues
field_is_closed: Issue closed
field_is_default: Default value
field_tracker: Tracker
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 99aa29b2c..bb33f4140 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,6 +159,7 @@ table.list th, .table-list-header { background-color:#EEEEEE; padding: 4px; whit
table.list td {text-align:center; vertical-align:top; padding-right:10px;}
table.list td.id { width: 2%; text-align: center;}
table.list td.name, table.list td.description, table.list td.subject, table.list td.comments, table.list td.roles {text-align: left;}
+table.list td.num { width: 2%; }
table.list td.tick {width:15%}
table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
table.list td.checkbox input {padding:0px;}