jro_apps/redmine Commit - r944:5e38bd93634b

Performance improvement on workflow setup screen....

Jean-Philippe Lang -

r944:5e38bd93634b

parent child

Context file:

r944:5e38bd93634b

Collapse all files

db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddRoleTrackerOldStatusIndexToWorkflows < ActiveRecord::Migration
	2	def self.up
	3	add_index :workflows, [:role_id, :tracker_id, :old_status_id], :name => :workflows_role_tracker_old_status
	4	end
	5
	6	def self.down
	7	remove_index :workflows, :name => :workflows_role_tracker_old_status
	8	end
	9	end

app/controllers/roles_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RolesController < ApplicationController
               layout 'base'
               before_filter :require_admin
               verify :method => :post, :only => [ :destroy, :move ],
                      :redirect_to => { :action => :list }
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 # Prefills the form with 'Non member' role permissions
                 @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
                 if request.post? && @role.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @permissions = @role.setable_permissions
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = @role.setable_permissions
               end
               def destroy
                 @role = Role.find(params[:id])
                 #unless @role.members.empty?
                 #  flash[:error] = 'Some members have this role. Can\'t delete it.'
                 #else
                   @role.destroy
                 #end
                 redirect_to :action => 'list'
               end
               def move
                 @role = Role.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @role.move_to_top
                 when 'higher'
                   @role.move_higher
                 when 'lower'
                   @role.move_lower
                 when 'lowest'
                   @role.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'list'
               end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'workflow', :role_id => @role, :tracker_id => @tracker
                   end
                 end
                 @roles = Role.find(:all, :order => 'builtin, position')
                 @trackers = Tracker.find(:all, :order => 'position')
-                @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
+                @statuses = IssueStatus.find(:all, :order => 'position')
               end
               def report
                 @roles = Role.find(:all, :order => 'builtin, position')
                 @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
                 if request.post?
                   @roles.each do |role|
                     role.permissions = params[:permissions][role.id.to_s]
                     role.save
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
             end

app/views/roles/workflow.rhtml +6 -8

             <h2><%=l(:label_workflow)%></h2>
             <p><%=l(:text_workflow_edit)%>:</p>
             <% form_tag({:action => 'workflow'}, :method => 'get') do %>
             <p><label for="role_id"><%=l(:label_role)%>:</label>
             <select id="role_id" name="role_id">
               <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
             </select>
             <label for="tracker_id"><%=l(:label_tracker)%>:</label>
             <select id="tracker_id" name="tracker_id">
               <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
             </select>
             <%= submit_tag l(:button_edit) %>
             </p>
             <% end %>
             <% unless @tracker.nil? or @role.nil? %>
             <% form_tag({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
             <div class="box">
             	<table>
             	<tr>
             	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
             	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
             	</tr>
             	<tr>
             	<td></td>
             	<% for new_status in @statuses %>
             		<td width="80" align="center"><%= new_status.name %></td>
             	<% end %>
             	</tr>
             	<% for old_status in @statuses %>
             		<tr>
             		<td><%= old_status.name %></td>
-            		<% for new_status in @statuses %>
+            		<% new_status_ids_allowed = old_status.find_new_statuses_allowed_to(@role, @tracker).collect(&:id) -%>
+            		<% for new_status in @statuses -%>
             			<td align="center">
+                  <input type="checkbox"
-                 <input type="checkbox"
                   name="issue_status[<%= old_status.id %>][]"
                   value="<%= new_status.id %>"
-                  <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
+                  <%= 'checked="checked"' if new_status_ids_allowed.include? new_status.id %>>
             			</td>
-            		<% end %>
+            		<% end -%>
             		</tr>
             	<% end %>
             	</table>
                 <p><%= check_all_links 'workflow_form' %></p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages