jro_apps/redmine Commit - r907:8d91afc33e3b

Added per-project tracker selection. Trackers can be selected on project settings....

Jean-Philippe Lang -

r907:8d91afc33e3b

parent child

Context file:

r907:8d91afc33e3b

Collapse all files

db/migrate/081_create_projects_trackers.rb created 644 +19 0

@@ -0,0 +1,19
	1	class CreateProjectsTrackers < ActiveRecord::Migration
	2	def self.up
	3	create_table :projects_trackers, :id => false do \|t\|
	4	t.column :project_id, :integer, :default => 0, :null => false
	5	t.column :tracker_id, :integer, :default => 0, :null => false
	6	end
	7	add_index :projects_trackers, :project_id, :name => :projects_trackers_project_id
	8
	9	# Associates all trackers to all projects (as it was before)
	10	tracker_ids = Tracker.find(:all).collect(&:id)
	11	Project.find(:all).each do \|project\|
	12	project.tracker_ids = tracker_ids
	13	end
	14	end
	15
	16	def self.down
	17	drop_table :projects_trackers
	18	end
	19	end

test/fixtures/projects_trackers.yml created 644 +46 0

@@ -0,0 +1,46
	1	---
	2	projects_trackers_012:
	3	project_id: 4
	4	tracker_id: 3
	5	projects_trackers_001:
	6	project_id: 1
	7	tracker_id: 1
	8	projects_trackers_013:
	9	project_id: 5
	10	tracker_id: 1
	11	projects_trackers_002:
	12	project_id: 1
	13	tracker_id: 2
	14	projects_trackers_014:
	15	project_id: 5
	16	tracker_id: 2
	17	projects_trackers_003:
	18	project_id: 1
	19	tracker_id: 3
	20	projects_trackers_015:
	21	project_id: 5
	22	tracker_id: 3
	23	projects_trackers_004:
	24	project_id: 2
	25	tracker_id: 1
	26	projects_trackers_005:
	27	project_id: 2
	28	tracker_id: 2
	29	projects_trackers_006:
	30	project_id: 2
	31	tracker_id: 3
	32	projects_trackers_007:
	33	project_id: 3
	34	tracker_id: 1
	35	projects_trackers_008:
	36	project_id: 3
	37	tracker_id: 2
	38	projects_trackers_009:
	39	project_id: 3
	40	tracker_id: 3
	41	projects_trackers_010:
	42	project_id: 4
	43	tracker_id: 1
	44	projects_trackers_011:
	45	project_id: 4
	46	tracker_id: 2

app/controllers/issues_controller.rb +1 0

                         :change_status => User.current.allowed_to?(:change_issue_status, @project),
                         :add => User.current.allowed_to?(:add_issues, @project),
                         :move => User.current.allowed_to?(:move_issues, @project),
+                        :copy => (@project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => User.current.allowed_to?(:delete_issues, @project)}
                 render :layout => false
               end

app/controllers/projects_controller.rb +16 -10

               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
+                @trackers = Tracker.all
                 @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}")
                 @project = Project.new(params[:project])
                 @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
+                  @project.trackers = Tracker.all
                 else
                   @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
-                @trackers = Tracker.find(:all, :order => 'position')
+                @trackers = @project.trackers
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
                 @total_hours = @project.time_entries.sum(:hours)
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
+                @trackers = Tracker.all
                 @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
                 @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
                 @issue.project = @project
                 @issue.author = User.current
-                @issue.tracker ||= Tracker.find(params[:tracker_id])
+                @issue.tracker ||= @project.trackers.find(params[:tracker_id])
                 default_status = IssueStatus.default
                 unless default_status
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :controller => 'issues', :action => 'index', :project_id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 if User.current.admin?
                 else
                   User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
-                # issue can be moved to any tracker
+                @target_project = @projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
-                @trackers = Tracker.find(:all)
+                @target_project ||= @project
-                if request.post? && params[:new_project_id] && @projects.collect(&:id).include?(params[:new_project_id].to_i) && params[:new_tracker_id]
+                @trackers = @target_project.trackers
-                  new_project = Project.find_by_id(params[:new_project_id])
+                if request.post?
-                  new_tracker = params[:new_tracker_id].blank? ? nil : Tracker.find_by_id(params[:new_tracker_id])
+                  new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
-                    unsaved_issue_ids << issue.id unless issue.move_to(new_project, new_tracker)
+                    unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+                  return
                 end
+                render :layout => false if request.xhr?
               end
               # Add a news to @project
               # Show changelog for @project
               def changelog
-                @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
+                @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
-                @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
+                @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]

app/controllers/reports_controller.rb +2 -2

                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
-                  @rows = Tracker.find :all, :order => 'position'
+                  @rows = @project.trackers
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                   @report_title = l(:field_subproject)
                   render :template => "reports/issue_report_details"
                 else
-                  @trackers = Tracker.find(:all, :order => 'position')
+                  @trackers = @project.trackers
                   @versions = @project.versions.sort
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories

app/helpers/projects_helper.rb +1 -1

               end if Object.const_defined?(:Magick)
               def new_issue_selector
-                trackers = Tracker.find(:all, :order => 'position')
+                trackers = @project.trackers
                 # can't use form tag inside helper
                 content_tag('form',
                   select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),

app/models/custom_value.rb +2 -2

                 when 'float'
                   begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
                 when 'date'
-                  errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
+                  errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
                 when 'list'
-                  errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
+                  errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
                 end
               end
             end

app/models/issue.rb +5 -1

               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
-              validates_presence_of :subject, :description, :priority, :tracker, :author, :status
+              validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
                 end
               end
+              def validate_on_create
+                errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
+              end
               def before_create
                 # default assignment based on category
                 if assigned_to.nil? && category && category.assigned_to

app/models/project.rb +1 0

               has_many :users, :through => :members
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :enabled_modules, :dependent => :delete_all
+              has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"

app/models/tracker.rb +4 0

               def to_s; name end
+              def self.all
+                find(:all, :order => 'position')
+              end
             private
               def check_integrity
                 raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])

app/views/issues/_sidebar.rhtml +1 -1

-            <% if authorize_for('projects', 'add_issue') %>
+            <% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
             <h3><%= l(:label_issue_new) %></h3>
             <%= l(:label_tracker) %>: <%= new_issue_selector %>
             <% end %>

app/views/issues/context_menu.rhtml +1 -1

             		</ul>
             	</li>
             	<li><%= context_menu_link l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue},
-            	        :class => 'icon-copy', :disabled => !@can[:add] %></li>
+            	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
             	<li><%= context_menu_link l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id },
             	                          :class => 'icon-move', :disabled => !@can[:move]  %>
                 <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue},

app/views/projects/_form.rhtml +20 -4

@@ -17,16 +17,32
17	<% for @custom_value in @custom_values %>	17	<% for @custom_value in @custom_values %>
18	<p><%= custom_field_tag_with_label @custom_value %></p>	18	<p><%= custom_field_tag_with_label @custom_value %></p>
19	<% end %>	19	<% end %>
		20	</div>
		21
		22	<% unless @trackers.empty? %>
		23	<fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
		24	<% @trackers.each do \|tracker\| %>
		25	<label class="floating">
		26	<%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
		27	<%= tracker %>
		28	</label>
		29	<% end %>
		30	<%= hidden_field_tag 'project[tracker_ids][]', '' %>
		31	</fieldset>
		32	<% end %>
20		33
21	<% unless @custom_fields.empty? %>	34	<% unless @custom_fields.empty? %>
22	<p><l~~abel~~><%=l(:label_custom_field_plural)%></l~~abel~~>	35	<fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
23	<% for custom_field in @custom_fields %>	36	<% for custom_field in @custom_fields %>
		37	<label class="floating">
24	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>	38	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
25	<%= custom_field.name %>	39	<%= custom_field.name %>
26	<% end %></p>	40	</label>
		41	<% end %>
		42	</fieldset>
27	<% end %>	43	<% end %>
28	<!--[eoform:project]-->	44	<!--[eoform:project]-->
29	</div>	45
30		46
31	<% content_for :header_tags do %>	47	<% content_for :header_tags do %>
32	<%= javascript_include_tag 'calendar/calendar' %>	48	<%= javascript_include_tag 'calendar/calendar' %>

app/views/projects/add.rhtml +6 -6

             <% labelled_tabular_form_for :project, @project, :url => { :action => "add" } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
-            <div class="box">
+            <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
-            <p><label><%= l(:label_module_plural) %></label>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
-            <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %>
+                <label class="floating">
-            <% end %></p>
+                <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %>
-            </div>
+                </label>
+            <% end %>
+            </fieldset>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/projects/move_issues.rhtml +7 -2

             <h2><%=l(:button_move)%></h2>
-            <% form_tag({:action => 'move_issues', :id => @project}, :class => "tabular") do %>
+            <% form_tag({:action => 'move_issues', :id => @project}, :class => 'tabular', :id => 'move_form') do %>
             <div class="box">
             <p><label><%= l(:label_issue_plural) %> :</label>
             <!--[form:issue]-->
             <p><label for="new_project_id"><%=l(:field_project)%> :</label>
-            <%= select_tag "new_project_id", options_from_collection_for_select(@projects, "id", "name", @project.id) %></p>
+            <%= select_tag "new_project_id",
+                           options_from_collection_for_select(@projects, 'id', 'name', @target_project.id),
+                           :onchange => remote_function(:url => {:action => 'move_issues' , :id => @project},
+                                                        :method => :get,
+                                                        :update => 'content',
+                                                        :with => "Form.serialize('move_form')") %></p>
             <p><label for="new_tracker_id"><%=l(:field_tracker)%> :</label>
             <%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>

app/views/projects/show.rhtml +1 -1

             </div>
             <% content_for :sidebar do %>
-                <% if authorize_for('projects', 'add_issue') %>
+                <% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
                 <h3><%= l(:label_issue_new) %></h3>
                 <%= l(:label_tracker) %>: <%= new_issue_selector %>
                 <% end %>

test/functional/projects_controller_test.rb +1 -1

             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :issue_statuses, :enabled_modules, :enumerations
+              fixtures :projects, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations
               def setup
                 @controller = ProjectsController.new

test/unit/issue_test.rb +1 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class IssueTest < Test::Unit::TestCase
-              fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
+              fixtures :projects, :users, :members, :trackers, :projects_trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
               def test_category_based_assignment
                 issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)

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