summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-01-25 13:52:40 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-01-25 13:52:40 +0000
commite944fc74df201ec73852add5d2513a4258355e5f (patch)
tree30b5c85af6af0385814a7175af05295f35e5db3c
parentad059f9637775963183fdf45057bdfe163e8aef0 (diff)
downloadredmine-e944fc74df201ec73852add5d2513a4258355e5f.tar.gz
redmine-e944fc74df201ec73852add5d2513a4258355e5f.zip
Render the project list as a tree on Move form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2315 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/issues_controller.rb2
-rw-r--r--app/views/issues/move.rhtml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 27d00e721..62e5e5787 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -271,7 +271,7 @@ class IssuesController < ApplicationController
# 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), :order => 'name')
+ @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current))
else
User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
end
diff --git a/app/views/issues/move.rhtml b/app/views/issues/move.rhtml
index f6fe376ff..e1189db45 100644
--- a/app/views/issues/move.rhtml
+++ b/app/views/issues/move.rhtml
@@ -8,7 +8,7 @@
<div class="box tabular">
<p><label for="new_project_id"><%=l(:field_project)%>:</label>
<%= select_tag "new_project_id",
- options_from_collection_for_select(@allowed_projects, 'id', 'name', @target_project.id),
+ project_tree_options_for_select(@allowed_projects, :selected => @target_project),
:onchange => remote_function(:url => { :action => 'move' },
:method => :get,
:update => 'content',