jro_apps/redmine Commit - r206:fa688d48e673

db/migrate/021_add_tracker_position.rb created 644 +10 0

@@ -0,0 +1,10
	1	class AddTrackerPosition < ActiveRecord::Migration
	2	def self.up
	3	add_column :trackers, :position, :integer, :default => 1, :null => false
	4	Tracker.find(:all).each_with_index {\|tracker, i\| tracker.update_attribute(:position, i+1)}
	5	end
	6
	7	def self.down
	8	remove_column :trackers, :position
	9	end
	10	end

app/controllers/custom_fields_controller.rb +2 -2

                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :tab => @custom_field.type
                 end
-                @trackers = Tracker.find(:all)
+                @trackers = Tracker.find(:all, :order => 'position')
               end
               def edit
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :tab => @custom_field.type
                 end
-                @trackers = Tracker.find(:all)
+                @trackers = Tracker.find(:all, :order => 'position')
               end
               def destroy

app/controllers/projects_controller.rb +3 -3

                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children.size > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
-                @trackers = Tracker.find(:all)
+                @trackers = Tracker.find(:all, :order => 'position')
                 @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])
               end
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
-                @trackers = Tracker.find :all
+                @trackers = Tracker.find :all, :order => 'position'
                 render :layout => false if request.xhr?
               end
               # Show changelog for @project
               def changelog
-                @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
+                @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else

app/controllers/reports_controller.rb +2 -2

                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
-                  @rows = Tracker.find :all
+                  @rows = Tracker.find :all, :order => 'position'
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                   render :template => "reports/issue_report_details"
                 else
                   @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
-                  @trackers = Tracker.find(:all)
+                  @trackers = Tracker.find(:all, :order => 'position')
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories
                   @authors = @project.members.collect { |m| m.user }

app/controllers/roles_controller.rb +1 -1

                   end
                 end
                 @roles = Role.find(:all, :order => 'position')
-                @trackers = Tracker.find :all
+                @trackers = Tracker.find(:all, :order => 'position')
                 @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
               end
             end

app/controllers/trackers_controller.rb +16 -1

               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :list }
               def list
-                @tracker_pages, @trackers = paginate :trackers, :per_page => 10
+                @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
                 render :action => "list", :layout => false if request.xhr?
               end
                 end
               end
+              def move
+                @tracker = Tracker.find(params[:id])
+                case params[:position]
+                when 'highest'
+                  @tracker.move_to_top
+                when 'higher'
+                  @tracker.move_higher
+                when 'lower'
+                  @tracker.move_lower
+                when 'lowest'
+                  @tracker.move_to_bottom
+                end if params[:position]
+                redirect_to :action => 'list'
+              end
               def destroy
                 @tracker = Tracker.find(params[:id])
                 unless @tracker.issues.empty?

app/models/query.rb +1 -1

               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 },

app/models/tracker.rb +1 0

               has_many :issues
               has_many :workflows, :dependent => :delete_all
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => 'custom_fields_trackers', :association_foreign_key => 'custom_field_id'
+              acts_as_list
               validates_presence_of :name
               validates_uniqueness_of :name

app/views/trackers/list.rhtml +7 0

             <table class="list">
               <thead><tr>
               <th><%=l(:label_tracker)%></th>
+              <th><%=l(:button_sort)%></th>
               <th></th>
               </tr></thead>
               <tbody>
               <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" %>
               </td>
               </tr>

doc/CHANGELOG +1 -1

             * settings are now stored in the database and editable through the application in: Admin -> Settings (config_custom.rb is no longer used)
             * mail notifications added when a document, a file or an attachment is added
             * tooltips added on Gantt chart and calender to view the details of the issues
-            * ability to set the sort order for roles, issue statuses
+            * ability to set the sort order for roles, trackers, issue statuses
             * added missing fields to csv export: priority, start date, due date, done ratio
             * 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-)
             * added back "fixed version" field on issue screen and in filters

	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