mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Backported r3683 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3717 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
b26d0fe041
commit
f6d2a4c29f
@ -283,14 +283,7 @@ class IssuesController < ApplicationController
|
|||||||
|
|
||||||
def move
|
def move
|
||||||
@copy = params[:copy_options] && params[:copy_options][:copy]
|
@copy = params[:copy_options] && params[:copy_options][:copy]
|
||||||
@allowed_projects = []
|
@allowed_projects = Issue.allowed_target_projects_on_move
|
||||||
# find projects to which the user is allowed to move the issue
|
|
||||||
if User.current.admin?
|
|
||||||
# admin is allowed to move issues to any active (visible) project
|
|
||||||
@allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current))
|
|
||||||
else
|
|
||||||
User.current.memberships.each {|m| @allowed_projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
|
|
||||||
end
|
|
||||||
@target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
|
@target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
|
||||||
@target_project ||= @project
|
@target_project ||= @project
|
||||||
@trackers = @target_project.trackers
|
@trackers = @target_project.trackers
|
||||||
|
|||||||
@ -389,6 +389,22 @@ class Issue < ActiveRecord::Base
|
|||||||
Issue.update_versions(["#{Version.table_name}.project_id IN (?) OR #{Issue.table_name}.project_id IN (?)", moved_project_ids, moved_project_ids])
|
Issue.update_versions(["#{Version.table_name}.project_id IN (?) OR #{Issue.table_name}.project_id IN (?)", moved_project_ids, moved_project_ids])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Returns an array of projects that current user can move issues to
|
||||||
|
def self.allowed_target_projects_on_move
|
||||||
|
projects = []
|
||||||
|
if User.current.admin?
|
||||||
|
# admin is allowed to move issues to any active (visible) project
|
||||||
|
projects = Project.visible.all
|
||||||
|
elsif User.current.logged?
|
||||||
|
if Role.non_member.allowed_to?(:move_issues)
|
||||||
|
projects = Project.visible.all
|
||||||
|
else
|
||||||
|
User.current.memberships.each {|m| projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
projects
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# Update issues so their versions are not pointing to a
|
# Update issues so their versions are not pointing to a
|
||||||
|
|||||||
@ -599,4 +599,20 @@ class IssueTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context ".allowed_target_projects_on_move" do
|
||||||
|
should "return all active projects for admin users" do
|
||||||
|
User.current = User.find(1)
|
||||||
|
assert_equal Project.active.count, Issue.allowed_target_projects_on_move.size
|
||||||
|
end
|
||||||
|
|
||||||
|
should "return allowed projects for non admin users" do
|
||||||
|
User.current = User.find(2)
|
||||||
|
Role.non_member.remove_permission! :move_issues
|
||||||
|
assert_equal 3, Issue.allowed_target_projects_on_move.size
|
||||||
|
|
||||||
|
Role.non_member.add_permission! :move_issues
|
||||||
|
assert_equal Project.active.count, Issue.allowed_target_projects_on_move.size
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user