jro_apps/redmine Commit - r13599:01f673be08be

Removed :move_issues permission (#18855)....

Jean-Philippe Lang -

r13599:01f673be08be

parent child

Context file:

r13599:01f673be08be

Collapse all files

db/migrate/20150208105930_replace_move_issues_permission.rb created 644 +18 0

			@@ -0,0 +1,18
		1	class ReplaceMoveIssuesPermission < ActiveRecord::Migration
		2	def self.up
		3	Role.all.each do \|role\|
		4	if role.has_permission?(:edit_issues) && !role.has_permission?(:move_issues)
		5	# inserts one ligne per trakcer and status
		6	WorkflowPermission.connection.insert_sql(
		7	"INSERT INTO #{WorkflowPermission.table_name} (tracker_id, old_status_id, role_id, type, field_name, rule)" +
		8	" SELECT t.id, s.id, #{role.id}, 'WorkflowPermission', 'project_id', 'readonly'" +
		9	" FROM #{Tracker.table_name} t, #{IssueStatus.table_name} s"
		10	)
		11	end
		12	end
		13	end
		14
		15	def self.down
		16	raise IrreversibleMigration
		17	end
		18	end

app/controllers/context_menus_controller.rb +1 -2

                  @can = {:edit => User.current.allowed_to?(:edit_issues, @projects),
                          :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
-                         :move => (@project && User.current.allowed_to?(:move_issues, @project)),
-                         :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
+                         :copy => User.current.allowed_to?(:add_issues, @projects),
                          :delete => User.current.allowed_to?(:delete_issues, @projects)
                          }
                  if @project

app/controllers/issues_controller.rb +5 -7

                  @copy = params[:copy].present?
                  @notes = params[:notes]
-                 if User.current.allowed_to?(:move_issues, @projects)
-                   @allowed_projects = Issue.allowed_target_projects_on_move
-                   if params[:issue]
-                     @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
-                     if @target_project
-                       target_projects = [@target_project]
-                     end
+                 @allowed_projects = Issue.allowed_target_projects
+                 if params[:issue]
+                   @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
+                   if @target_project
+                     target_projects = [@target_project]
                    end
                  end
                  target_projects ||= @projects

app/models/issue.rb +12 -10

                  :if => lambda {|issue, user|
                    if issue.new_record?
                      issue.copy?
-                   elsif user.allowed_to?(:move_issues, issue.project)
-                     Issue.allowed_target_projects_on_move.count > 1
+                   else
+                     user.allowed_to?(:edit_issues, issue.project)
                    end
                  }
                # Returns a scope of projects that user can assign the issue to
                def allowed_target_projects(user=User.current)
-                 if new_record?
-                   Project.where(Project.allowed_to_condition(user, :add_issues))
-                 else
-                   self.class.allowed_target_projects_on_move(user)
-                 end
+                 current_project = new_record? ? nil : project
+                 self.class.allowed_target_projects(user, current_project)
                end
-               # Returns a scope of projects that user can move issues to
-               def self.allowed_target_projects_on_move(user=User.current)
-                 Project.where(Project.allowed_to_condition(user, :move_issues))
+               # Returns a scope of projects that user can assign issues to
+               # If current_project is given, it will be included in the scope
+               def self.allowed_target_projects(user=User.current, current_project=nil)
+                 condition = Project.allowed_to_condition(user, :add_issues)
+                 if current_project
+                   condition = ["(#{condition}) OR #{Project.table_name}.id = ?", current_project.id]
+                 end
+                 Project.where(condition)
                end
                private

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

                        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
              <% else %>
                <li><%= context_menu_link l(:button_copy), bulk_edit_issues_path(:ids => @issue_ids, :copy => '1'),
-                                       :class => 'icon-copy', :disabled => !@can[:move] %></li>
+                                       :class => 'icon-copy', :disabled => !@can[:copy] %></li>
              <% end %>
                <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issue_ids, :back_url => @back),
                                          :method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon-del', :disabled => !@can[:delete] %></li>

lib/redmine.rb 0 -1

                  map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                  map.permission :view_private_notes, {}, :read => true, :require => :member
                  map.permission :set_notes_private, {}, :require => :member
-                 map.permission :move_issues, {:issues => [:bulk_edit, :bulk_update]}, :require => :loggedin
                  map.permission :delete_issues, {:issues => :destroy}, :require => :member
                  # Queries
                  map.permission :manage_public_queries, {:queries => [:new, :create, :edit, :update, :destroy]}, :require => :member

test/fixtures/roles.yml 0 -3

                  - :manage_issue_relations
                  - :manage_subtasks
                  - :add_issue_notes
-                 - :move_issues
                  - :delete_issues
                  - :view_issue_watchers
                  - :add_issue_watchers
                  - :manage_issue_relations
                  - :manage_subtasks
                  - :add_issue_notes
-                 - :move_issues
                  - :delete_issues
                  - :view_issue_watchers
                  - :save_queries
                  - :edit_issues
                  - :manage_issue_relations
                  - :add_issue_notes
-                 - :move_issues
                  - :view_issue_watchers
                  - :save_queries
                  - :view_gantt

test/unit/issue_test.rb +4 -4

                  assert issue.save
                end
-               def test_allowed_target_projects_on_move_should_include_projects_with_issue_tracking_enabled
-                 assert_include Project.find(2), Issue.allowed_target_projects_on_move(User.find(2))
+               def test_allowed_target_projects_should_include_projects_with_issue_tracking_enabled
+                 assert_include Project.find(2), Issue.allowed_target_projects(User.find(2))
                end
-               def test_allowed_target_projects_on_move_should_not_include_projects_with_issue_tracking_disabled
+               def test_allowed_target_projects_should_not_include_projects_with_issue_tracking_disabled
                  Project.find(2).disable_module! :issue_tracking
-                 assert_not_include Project.find(2), Issue.allowed_target_projects_on_move(User.find(2))
+                 assert_not_include Project.find(2), Issue.allowed_target_projects(User.find(2))
                end
                def test_move_to_another_project_with_same_category

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