summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-15 08:27:38 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-15 08:27:38 +0000
commitaec989707edc47161192eba74f1a88123b12360a (patch)
tree5a810a6a3fb4fb76b9cfdb439eedc666bf4d049a /app
parent993b60d61eb927cff21ea0b06c1631eb986f6a51 (diff)
downloadredmine-aec989707edc47161192eba74f1a88123b12360a.tar.gz
redmine-aec989707edc47161192eba74f1a88123b12360a.zip
Workflow copy:
* added the ability the copy an existing workflow when creating a new role (closes #841) * use a single raw insert statement to copy tracker/role workflow rather than instantiating hundreds/thousands of objects git-svn-id: http://redmine.rubyforge.org/svn/trunk@1252 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/roles_controller.rb5
-rw-r--r--app/controllers/trackers_controller.rb8
-rw-r--r--app/models/role.rb13
-rw-r--r--app/models/tracker.rb13
-rw-r--r--app/views/roles/_form.rhtml4
-rw-r--r--app/views/trackers/_form.rhtml5
6 files changed, 38 insertions, 10 deletions
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 4796bb7f0..9fdd9701b 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -36,10 +36,15 @@ class RolesController < ApplicationController
# Prefills the form with 'Non member' role permissions
@role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
if request.post? && @role.save
+ # workflow copy
+ if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
+ @role.workflows.copy(copy_from)
+ end
flash[:notice] = l(:notice_successful_create)
redirect_to :action => 'list'
end
@permissions = @role.setable_permissions
+ @roles = Role.find :all, :order => 'builtin, position'
end
def edit
diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 46edea548..3d7dbd5c5 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -37,16 +37,12 @@ class TrackersController < ApplicationController
if request.post? and @tracker.save
# workflow copy
if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
- Workflow.transaction do
- copy_from.workflows.find(:all, :include => [:role, :old_status, :new_status]).each do |w|
- Workflow.create(:tracker_id => @tracker.id, :role => w.role, :old_status => w.old_status, :new_status => w.new_status)
- end
- end
+ @tracker.workflows.copy(copy_from)
end
flash[:notice] = l(:notice_successful_create)
redirect_to :action => 'list'
end
- @trackers = Tracker.find :all
+ @trackers = Tracker.find :all, :order => 'position'
end
def edit
diff --git a/app/models/role.rb b/app/models/role.rb
index 015146dc4..6f1fb4768 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -21,7 +21,18 @@ class Role < ActiveRecord::Base
BUILTIN_ANONYMOUS = 2
before_destroy :check_deletable
- has_many :workflows, :dependent => :delete_all
+ has_many :workflows, :dependent => :delete_all do
+ def copy(role)
+ raise "Can not copy workflow from a #{role.class}" unless role.is_a?(Role)
+ raise "Can not copy workflow from/to an unsaved role" if proxy_owner.new_record? || role.new_record?
+ clear
+ connection.insert "INSERT INTO workflows (tracker_id, old_status_id, new_status_id, role_id)" +
+ " SELECT tracker_id, old_status_id, new_status_id, #{proxy_owner.id}" +
+ " FROM workflows" +
+ " WHERE role_id = #{role.id}"
+ end
+ end
+
has_many :members
acts_as_list
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 07253a227..ecee908eb 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -18,7 +18,18 @@
class Tracker < ActiveRecord::Base
before_destroy :check_integrity
has_many :issues
- has_many :workflows, :dependent => :delete_all
+ has_many :workflows, :dependent => :delete_all do
+ def copy(tracker)
+ raise "Can not copy workflow from a #{tracker.class}" unless tracker.is_a?(Tracker)
+ raise "Can not copy workflow from/to an unsaved tracker" if proxy_owner.new_record? || tracker.new_record?
+ clear
+ connection.insert "INSERT INTO workflows (tracker_id, old_status_id, new_status_id, role_id)" +
+ " SELECT #{proxy_owner.id}, old_status_id, new_status_id, role_id" +
+ " FROM workflows" +
+ " WHERE tracker_id = #{tracker.id}"
+ end
+ end
+
has_and_belongs_to_many :projects
has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
acts_as_list
diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index b77cbacdf..58dc2af41 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -4,6 +4,10 @@
<div class="box">
<p><%= f.text_field :name, :required => true %></p>
<p><%= f.check_box :assignable %></p>
+<% if @role.new_record? && @roles.any? %>
+<p><label><%= l(:label_copy_workflow_from) %></label>
+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %></p>
+<% end %>
</div>
<% end %>
diff --git a/app/views/trackers/_form.rhtml b/app/views/trackers/_form.rhtml
index 26a34443c..856b70bbc 100644
--- a/app/views/trackers/_form.rhtml
+++ b/app/views/trackers/_form.rhtml
@@ -4,8 +4,9 @@
<p><%= f.text_field :name, :required => true %></p>
<p><%= f.check_box :is_in_chlog %></p>
<p><%= f.check_box :is_in_roadmap %></p>
-<% if @tracker.new_record? %>
-<p><label><%= l(:label_copy_workflow_from) %></label> <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
+<% if @tracker.new_record? && @trackers.any? %>
+<p><label><%= l(:label_copy_workflow_from) %></label>
+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
<% end %>
<!--[eoform:tracker]-->
</div>