jro_apps/redmine Commit - r15048:a6828512c02b

Adds Issue#allowed_target_trackers (#7839)....

Jean-Philippe Lang -

r15048:a6828512c02b

parent child

Context file:

r15048:a6828512c02b

Collapse all files

app/controllers/context_menus_controller.rb +1 -2

                   else
                     @assignables = @project.assignable_users
                   end
-                  @trackers = @project.trackers
                 else
                   #when multiple projects, we only keep the intersection of each set
                   @assignables = @projects.map(&:assignable_users).reduce(:&)
-                  @trackers = @projects.map(&:trackers).reduce(:&)
                 end
+                @trackers = @projects.map {|p| Issue.allowed_target_trackers(p) }.reduce(:&)
                 @versions = @projects.map {|p| p.shared_versions.open}.reduce(:&)
                 @priorities = IssuePriority.active.reverse

app/controllers/issues_controller.rb +2 -2

                 end
                 @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&)
                 @assignables = target_projects.map(&:assignable_users).reduce(:&)
-                @trackers = target_projects.map(&:trackers).reduce(:&)
+                @trackers = target_projects.map {|p| Issue.allowed_target_trackers(p) }.reduce(:&)
                 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
                 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
                 if @copy
                 @issue.safe_attributes = attrs
                 if @issue.project
-                  @issue.tracker ||= @issue.project.trackers.first
+                  @issue.tracker ||= @issue.allowed_target_trackers.first
                   if @issue.tracker.nil?
                     render_error l(:error_no_tracker_in_project)
                     return false

app/helpers/issues_helper.rb +10 0

@@ -168,6 +168,16 module IssuesHelper
168	link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))	168	link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
169	end	169	end
170		170
		171	def trackers_options_for_select(issue)
		172	trackers = issue.allowed_target_trackers
		173	if issue.new_record? && issue.parent_issue_id.present?
		174	trackers = trackers.reject do \|tracker\|
		175	issue.tracker_id != tracker.id && tracker.disabled_core_fields.include?('parent_issue_id')
		176	end
		177	end
		178	trackers.collect {\|t\| [t.name, t.id]}
		179	end
		180
171	class IssueFieldsRows	181	class IssueFieldsRows
172	include ActionView::Helpers::TagHelper	182	include ActionView::Helpers::TagHelper
173		183

app/models/issue.rb +19 -13

                 end
                 if (t = attrs.delete('tracker_id')) && safe_attribute?('tracker_id')
-                  self.tracker_id = t
+                  if allowed_target_trackers(user).where(:id => t.to_i).exists?
+                    self.tracker_id = t
+                  end
                 end
                 if project
-                  # Set the default tracker to accept custom field values
+                  # Set a default tracker to accept custom field values
                   # even if tracker is not specified
-                  self.tracker ||= project.trackers.first
+                  self.tracker ||= allowed_target_trackers(user).first
                 end
                 statuses_allowed = new_statuses_allowed_to(user)
                 !leaf?
               end
-              def assignable_trackers
-                trackers = project.trackers
-                if new_record? && parent_issue_id.present?
-                  trackers = trackers.reject do |tracker|
-                    tracker_id != tracker.id && tracker.disabled_core_fields.include?('parent_issue_id')
-                  end
-                end
-                trackers
-              end
               # Users the issue can be assigned to
               def assignable_users
                 users = project.assignable_users.to_a
                 end
                 Project.where(condition).having_trackers
               end
+              # Returns a scope of trackers that user can assign the issue to
+              def allowed_target_trackers(user=User.current)
+                if project
+                  self.class.allowed_target_trackers(project, user, tracker_id_was)
+                else
+                  Tracker.none
+                end
+              end
+              # Returns a scope of trackers that user can assign project issues to
+              def self.allowed_target_trackers(project, user=User.current, current_tracker=nil)
+                project.trackers.sorted
+              end
               private

app/models/mail_handler.rb +8 -5

                 end
                 issue = Issue.new(:author => user, :project => project)
-                issue.safe_attributes = issue_attributes_from_keywords(issue)
+                attributes = issue_attributes_from_keywords(issue)
+                if handler_options[:no_permission_check]
+                  issue.tracker_id = attributes['tracker_id']
+                  if project
+                    issue.tracker_id ||= project.trackers.first.try(:id)
+                  end
+                end
+                issue.safe_attributes = attributes
                 issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
                 issue.subject = cleaned_up_subject
                 if issue.subject.blank?
                   'done_ratio' => get_keyword(:done_ratio, :format => '(\d|10)?0')
                 }.delete_if {|k, v| v.blank? }
-                if issue.new_record? && attrs['tracker_id'].nil?
-                  attrs['tracker_id'] = issue.project.trackers.first.try(:id)
-                end
                 attrs
               end

app/views/issues/_form.html.erb +1 -1

             <% end %>
             <% if @issue.safe_attribute? 'tracker_id' %>
-            <p><%= f.select :tracker_id, @issue.assignable_trackers.collect {|t| [t.name, t.id]}, {:required => true},
+            <p><%= f.select :tracker_id, trackers_options_for_select(@issue), {:required => true},
                             :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <% end %>

app/views/issues/index.html.erb +1 -1

             <div class="contextual">
-              <% if User.current.allowed_to?(:add_issues, @project, :global => true) && (@project.nil? || @project.trackers.any?) %>
+              <% if User.current.allowed_to?(:add_issues, @project, :global => true) && (@project.nil? || Issue.allowed_target_trackers(@project).any?) %>
                 <%= link_to l(:label_issue_new), _new_project_issue_path(@project), :class => 'icon icon-add new-issue' %>
               <% end %>
             </div>

lib/redmine.rb +1 -1

               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) },
-                          :if => Proc.new { |p| Setting.new_project_issue_tab_enabled? && p.trackers.any? },
+                          :if => Proc.new { |p| Setting.new_project_issue_tab_enabled? && Issue.allowed_target_trackers(p).any? },
                           :permission => :add_issues
               menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
               menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar

test/unit/issue_test.rb +3 -2

                 target = Tracker.find(2)
                 target.core_fields = %w(assigned_to_id due_date)
                 target.save!
+                user = User.find(2)
-                issue = Issue.new(:tracker => source)
+                issue = Issue.new(:project => Project.find(1), :tracker => source)
-                issue.safe_attributes = {'tracker_id' => 2, 'due_date' => '2012-07-14'}
+                issue.send :safe_attributes=, {'tracker_id' => 2, 'due_date' => '2012-07-14'}, user
                 assert_equal target, issue.tracker
                 assert_equal Date.parse('2012-07-14'), issue.due_date
               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