Fixed: admin should be able to move issues to any project.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@903 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: admin should be able to move issues to any project.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@903 e93f8b46-1217-0410-a6f0-8f06a7374b81
b0a8888e · Jean-Philippe Lang · 833c7bd6 · b0a8888e · b0a8888e
Commit b0a8888e authored Nov 14, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

projects_controller.rb app/controllers/projects_controller.rb +7 -2

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

No files found.
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -295,10 +295,15 @@ class ProjectsController < ApplicationController
    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
-    User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:controller => 'projects', :action => 'move_issues')}
+    if User.current.admin?
+      # admin is allowed to move issues to any active (visible) project
+      @projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
+    else
+      User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:controller => 'projects', :action => 'move_issues')}
+    end
    # issue can be moved to any tracker
    @trackers = Tracker.find(:all)
-    if request.post? and params[:new_project_id] and params[:new_tracker_id]    
+    if request.post? && params[:new_project_id] && @projects.collect(&:id).include?(params[:new_project_id].to_i) && params[:new_tracker_id]    
      new_project = Project.find_by_id(params[:new_project_id])
      new_tracker = Tracker.find_by_id(params[:new_tracker_id])
      @issues.each do |i|

--- a/app/views/projects/move_issues.rhtml
+++ b/app/views/projects/move_issues.rhtml
@@ -18,7 +18,7 @@
 <%= select_tag "new_project_id", options_from_collection_for_select(@projects, "id", "name", @project.id) %></p>

 <p><label for="new_tracker_id"><%=l(:field_tracker)%> :</label>
-<%= select_tag "new_tracker_id", '<option></option>' + options_from_collection_for_select(@trackers, "id", "name") %></p>
+<%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>
 </div>
 <%= submit_tag l(:button_move) %>
 <% end %>