added the ability to set the sort order for trackers

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

diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index 29314f4b189b773ab497b83bd8689a9d3577e3a1..7d88296418acc9ddd724a36e49745268e92606cc 100644 (file)
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -47,7 +47,7 @@ class CustomFieldsController < ApplicationController
       flash[:notice] = l(:notice_successful_create)\r
       redirect_to :action => 'list', :tab => @custom_field.type\r
     end\r
-    @trackers = Tracker.find(:all)\r
+    @trackers = Tracker.find(:all, :order => 'position')\r
   end\r
 \r
   def edit\r
@@ -59,7 +59,7 @@ class CustomFieldsController < ApplicationController
       flash[:notice] = l(:notice_successful_update)\r
       redirect_to :action => 'list', :tab => @custom_field.type\r
     end\r
-    @trackers = Tracker.find(:all)\r
+    @trackers = Tracker.find(:all, :order => 'position')\r
   end\r
 
   def destroy

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 815edb87dfa1ec10d7129bbab4a3cf32d4275423..5d42221c3a529547c5f7cf4595802f31528c10ff 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -81,7 +81,7 @@ class ProjectsController < ApplicationController
     @members = @project.members.find(:all, :include => [:user, :role])\r
     @subprojects = @project.children if @project.children.size > 0\r
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")\r
-    @trackers = Tracker.find(:all)\r
+    @trackers = Tracker.find(:all, :order => 'position')\r
     @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN issue_statuses ON issue_statuses.id = issues.status_id", :conditions => ["project_id=? and issue_statuses.is_closed=?", @project.id, false])
     @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])\r
   end
@@ -245,7 +245,7 @@ class ProjectsController < ApplicationController
                                                :limit  =>  @issue_pages.items_per_page,\r
                                                :offset =>  @issue_pages.current.offset                                         \r
     end    \r
-    @trackers = Tracker.find :all\r
+    @trackers = Tracker.find :all, :order => 'position'\r
     render :layout => false if request.xhr?\r
   end\r
 \r
@@ -404,7 +404,7 @@ class ProjectsController < ApplicationController
   \r
   # Show changelog for @project\r
   def changelog\r
-    @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])\r
+    @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')\r
     if request.get?\r
       @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }\r
     else\r

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 2e2f0fc8ef7e778e8848ad18a409da2bdb851697..aa26e24b98c7c0bc0cd31f96358117ad0ef469dc 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -25,7 +25,7 @@ class ReportsController < ApplicationController
     case params[:detail]\r
     when "tracker"\r
       @field = "tracker_id"\r
-      @rows = Tracker.find :all\r
+      @rows = Tracker.find :all, :order => 'position'\r
       @data = issues_by_tracker\r
       @report_title = l(:field_tracker)\r
       render :template => "reports/issue_report_details"\r
@@ -49,7 +49,7 @@ class ReportsController < ApplicationController
       render :template => "reports/issue_report_details"  \r
     else\r
       @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]\r
-      @trackers = Tracker.find(:all)\r
+      @trackers = Tracker.find(:all, :order => 'position')\r
       @priorities = Enumeration::get_values('IPRI')\r
       @categories = @project.issue_categories\r
       @authors = @project.members.collect { |m| m.user }\r

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 6ac08a7676ae95fb40f491fc7f1c425e785f9dea..b26cf730b93972a839d5f4bc6b43423f15d038ff 100644 (file)
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -96,7 +96,7 @@ class RolesController < ApplicationController
       end\r
     end\r
     @roles = Role.find(:all, :order => 'position')\r
-    @trackers = Tracker.find :all\r
+    @trackers = Tracker.find(:all, :order => 'position')\r
     @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')\r
   end
 end

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 186f8b7ae063b31993d41f62a6d9b003a159b91a..173f63c489c57991efd579225451da1b8ede89c7 100644 (file)
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -28,7 +28,7 @@ class TrackersController < ApplicationController
   verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :list }
 
   def list
-    @tracker_pages, @trackers = paginate :trackers, :per_page => 10\r
+    @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'\r
     render :action => "list", :layout => false if request.xhr?
   end
 
@@ -47,7 +47,22 @@ class TrackersController < ApplicationController
       redirect_to :action => 'list'
     end
   end
-
+\r
+  def move\r
+    @tracker = Tracker.find(params[:id])\r
+    case params[:position]\r
+    when 'highest'\r
+      @tracker.move_to_top\r
+    when 'higher'\r
+      @tracker.move_higher\r
+    when 'lower'\r
+      @tracker.move_lower\r
+    when 'lowest'\r
+      @tracker.move_to_bottom\r
+    end if params[:position]\r
+    redirect_to :action => 'list'\r
+  end\r
+  
   def destroy
     @tracker = Tracker.find(params[:id])\r
     unless @tracker.issues.empty?\r

diff --git a/app/models/query.rb b/app/models/query.rb
index 5594e5cb6ab04726698ad4b963f3a950ba2cb035..b6c9b680a1b3bd6458ed7a8b6fcc31e71516637f 100644 (file)
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -70,7 +70,7 @@ class Query < ActiveRecord::Base
   def available_filters
     return @available_filters if @available_filters
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },       
-                           "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all).collect{|s| [s.name, s.id.to_s] } },                                                                                                                
+                           "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },                                                                                                                
                            "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
                            "subject" => { :type => :text, :order => 8 },  
                            "created_on" => { :type => :date_past, :order => 9 },                        

diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 8790bf72594876296e5163cb7d866dc2a53a997d..b584704c27ce5be72ac6d461e29112a769954561 100644 (file)
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -20,6 +20,7 @@ class Tracker < ActiveRecord::Base
   has_many :issues\r
   has_many :workflows, :dependent => :delete_all\r
   has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_trackers', :association_foreign_key => 'custom_field_id'\r
+  acts_as_list\r
 \r
   validates_presence_of :name\r
   validates_uniqueness_of :name\r

diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index 644b1324e424149176fa38ab35bbe30161fc3b34..a12e508458cf42ec3e621f3fb9bf3fc0e365e496 100644 (file)
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -7,12 +7,19 @@
 <table class="list">
   <thead><tr>
   <th><%=l(:label_tracker)%></th>\r
+  <th><%=l(:button_sort)%></th>
   <th></th>
   </tr></thead>
   <tbody>
 <% for tracker in @trackers %>
   <tr class="<%= cycle("odd", "even") %>">
   <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
+  <td align="center">
+    <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => tracker, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
+    <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => tracker, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
+    <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => tracker, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
+    <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => tracker, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
+  </td>
   <td align="center">
     <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>\r
   </td>

diff --git a/db/migrate/021_add_tracker_position.rb b/db/migrate/021_add_tracker_position.rb
new file mode 100644 (file)
index 0000000..30a5d77
--- /dev/null
+++ b/db/migrate/021_add_tracker_position.rb
@@ -0,0 +1,10 @@
+class AddTrackerPosition < ActiveRecord::Migration
+  def self.up
+    add_column :trackers, :position, :integer, :default => 1, :null => false
+    Tracker.find(:all).each_with_index {|tracker, i| tracker.update_attribute(:position, i+1)}
+  end
+
+  def self.down
+    remove_column :trackers, :position
+  end
+end

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 66d513e655cbb74ba0708b8f5a0b5ab58ba28e8e..23e0f6c319071c3b21ca62950d38524925062421 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -11,7 +11,7 @@ http://redmine.rubyforge.org/
 * settings are now stored in the database and editable through the application in: Admin -> Settings (config_custom.rb is no longer used)\r
 * mail notifications added when a document, a file or an attachment is added\r
 * tooltips added on Gantt chart and calender to view the details of the issues\r
-* ability to set the sort order for roles, issue statuses\r
+* ability to set the sort order for roles, trackers, issue statuses\r
 * added missing fields to csv export: priority, start date, due date, done ratio\r
 * all icons replaced (new icons are based on GPL icon set: "KDE Crystal Diamond 2.5" -by paolino- and "kNeu! Alpha v0.1" -by Pablo Fabregat-)\r
 * added back "fixed version" field on issue screen and in filters\r