diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-13 16:55:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-12-13 16:55:28 +0000 |
| commit | f731545c619b6e6a641d40f944e45f99aff8185e (patch) | |
| tree | 5196cbe7aacebce0c87f3a5672733859d44f1765 | |
| parent | e52ecb494b00a3e3e98778ac967e71734e15d733 (diff) | |
| download | redmine-f731545c619b6e6a641d40f944e45f99aff8185e.tar.gz redmine-f731545c619b6e6a641d40f944e45f99aff8185e.zip | |
Use a simple count query.
git-svn-id: http://svn.redmine.org/redmine/trunk@13750 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/workflows_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/workflow_transition.rb | 17 | ||||
| -rw-r--r-- | app/views/workflows/index.html.erb | 14 |
3 files changed, 10 insertions, 25 deletions
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index d00ee03bc..0968977cb 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -21,7 +21,9 @@ class WorkflowsController < ApplicationController before_filter :require_admin def index - @workflow_counts = WorkflowTransition.count_by_tracker_and_role + @roles = Role.sorted.select(&:consider_workflow?) + @trackers = Tracker.sorted + @workflow_counts = WorkflowTransition.group(:tracker_id, :role_id).count end def edit diff --git a/app/models/workflow_transition.rb b/app/models/workflow_transition.rb index 99c399644..d76916092 100644 --- a/app/models/workflow_transition.rb +++ b/app/models/workflow_transition.rb @@ -18,23 +18,6 @@ class WorkflowTransition < WorkflowRule validates_presence_of :new_status - # Returns workflow transitions count by tracker and role - def self.count_by_tracker_and_role - counts = connection.select_all("SELECT role_id, tracker_id, count(id) AS c FROM #{table_name} WHERE type = 'WorkflowTransition' GROUP BY role_id, tracker_id") - roles = Role.sorted.to_a.select(&:consider_workflow?) - trackers = Tracker.sorted - result = [] - trackers.each do |tracker| - t = [] - roles.each do |role| - row = counts.detect {|c| c['role_id'].to_s == role.id.to_s && c['tracker_id'].to_s == tracker.id.to_s} - t << [role, (row.nil? ? 0 : row['c'].to_i)] - end - result << [tracker, t] - end - result - end - def self.replace_transitions(trackers, roles, transitions) trackers = Array.wrap trackers roles = Array.wrap roles diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb index 029a149a4..3ee55d125 100644 --- a/app/views/workflows/index.html.erb +++ b/app/views/workflows/index.html.erb @@ -1,6 +1,6 @@ <%= title [l(:label_workflow), workflows_edit_path], l(:field_summary) %> -<% if @workflow_counts.empty? %> +<% if @roles.empty? || @trackers.empty? %> <p class="nodata"><%= l(:label_no_data) %></p> <% else %> <div class="autoscroll"> @@ -8,19 +8,19 @@ <thead> <tr> <th></th> - <% @workflow_counts.first.last.each do |role, count| %> + <% @roles.each do |role| %> <th> - <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %> + <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %> </th> - <% end %> </tr> </thead> <tbody> -<% @workflow_counts.each do |tracker, roles| -%> +<% @trackers.each do |tracker| -%> <tr class="<%= cycle('odd', 'even') %>"> - <td class="name"><%= h tracker %></td> - <% roles.each do |role, count| -%> + <td class="name"><%= tracker.name %></td> + <% @roles.each do |role| -%> + <% count = @workflow_counts[[tracker.id, role.id]] || 0 %> <td> <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %> </td> |