jro_apps/redmine Commit - r202:fe22797d6927

0

db/migrate/019_add_issue_status_position.rb created 644 +10 0

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

0

public/images/1downarrow.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

public/images/1uparrow.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

public/images/2downarrow.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

public/images/2uparrow.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

app/controllers/issue_statuses_controller.rb +19 -1

                layout 'base'
                before_filter :require_admin
+               verify :method => :post, :only => [ :destroy, :create, :update, :move ],
+                      :redirect_to => { :action => :list }
                def index
                  list
                  render :action => 'list' unless request.xhr?
                end
                def list
-                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 10
+                 @issue_status_pages, @issue_statuses = paginate :issue_statuses, :per_page => 25, :order => "position"
                  render :action => "list", :layout => false if request.xhr?
                end
                  end
                end
+               def move
+                 @issue_status = IssueStatus.find(params[:id])
+                 case params[:position]
+                 when 'highest'
+                   @issue_status.move_to_top
+                 when 'higher'
+                   @issue_status.move_higher
+                 when 'lower'
+                   @issue_status.move_lower
+                 when 'lowest'
+                   @issue_status.move_to_bottom
+                 end if params[:position]
+                 redirect_to :action => 'list'
+               end
                def destroy
                  IssueStatus.find(params[:id]).destroy
                  redirect_to :action => 'list'

0

app/controllers/issues_controller.rb +2 -2

                include IfpdfHelper
                def show
-                 @status_options = @issue.status.workflows.find(:all, :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
+                 @status_options = @issue.status.workflows.find(:all, :order => 'position', :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                  @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                  @journals_count = @issue.journals.count
                  @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "journals.created_on desc")
                def change_status
                  #@history = @issue.histories.build(params[:history])
-                 @status_options = @issue.status.workflows.find(:all, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
+                 @status_options = @issue.status.workflows.find(:all, :order => 'position', :include => :new_status, :conditions => ["role_id=? and tracker_id=?", self.logged_in_user.role_for_project(@project.id), @issue.tracker.id]).collect{ |w| w.new_status } if self.logged_in_user
                  @new_status = IssueStatus.find(params[:new_status_id])
                  if params[:confirm]
                    begin

0

app/controllers/reports_controller.rb +1 -1

                before_filter :find_project, :authorize
                def issue_report
-                 @statuses = IssueStatus.find :all
+                 @statuses = IssueStatus.find(:all, :order => 'position')
                  case params[:detail]
                  when "tracker"

0

app/controllers/roles_controller.rb +1 -1

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

0

app/models/issue_status.rb +1 0

              class IssueStatus < ActiveRecord::Base
                before_destroy :check_integrity
                has_many :workflows, :foreign_key => "old_status_id"
+               acts_as_list
                validates_presence_of :name
                validates_uniqueness_of :name

0

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).collect{|s| [s.name, s.id.to_s] } },
+                 @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] } },
                                         "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 },

0

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

                <th><%=l(:field_status)%></th>
                <th><%=l(:field_is_default)%></th>
                <th><%=l(:field_is_closed)%></th>
+               <th><%=l(:button_sort)%></th>
                <th></th>
                </tr></thead>
                <tbody>
                <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>
                <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>
                <td align="center">
+                 <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => status, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
+                 <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => status, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
+                 <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => status, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
+                 <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => status, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
+               </td>
+               <td align="center">
                  <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
                </td>
                </tr>

0

doc/CHANGELOG +1 0

              * 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 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

0

lang/de.yml +5 0

              label_view_revisions: Die Neuausgaben ansehen
              label_max_size: Maximale Größe
              label_on: auf
+             label_sort_highest: Erste
+             label_sort_higher: Aufzurichten
+             label_sort_lower: Herabzusteigen
+             label_sort_lowest: Letzter
              button_login: Einloggen
              button_submit: Einreichen
              button_back: Rückkehr
              button_cancel: Annullieren
              button_activate: Aktivieren
+             button_sort: Sortieren
              text_select_mail_notifications: Aktionen für die Mailbenachrichtigung aktiviert werden soll.
              text_regexp_info: eg. ^[A-Z0-9]+$

0

lang/en.yml +5 0

              label_view_revisions: View revisions
              label_max_size: Maximum size
              label_on: 'on'
+             label_sort_highest: Move to top
+             label_sort_higher: Move up
+             label_sort_lower: Move down
+             label_sort_lowest: Move to bottom
              button_login: Login
              button_submit: Submit
              button_back: Back
              button_cancel: Cancel
              button_activate: Activate
+             button_sort: Sort
              text_select_mail_notifications: Select actions for which mail notifications should be sent.
              text_regexp_info: eg. ^[A-Z0-9]+$

0

lang/es.yml +5 0

              label_view_revisions: Ver las revisiones
              label_max_size: Tamaño máximo
              label_on: en
+             label_sort_highest: Primero
+             label_sort_higher: Subir
+             label_sort_lower: Bajar
+             label_sort_lowest: Último
              button_login: Conexión
              button_submit: Someter
              button_back: Atrás
              button_cancel: Cancelar
              button_activate: Activar
+             button_sort: Clasificar
              text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
              text_regexp_info: eg. ^[A-Z0-9]+$

0

lang/fr.yml +5 0

              label_view_revisions: Voir les révisions
              label_max_size: Taille maximale
              label_on: sur
+             label_sort_highest: Remonter en premier
+             label_sort_higher: Remonter
+             label_sort_lower: Descendre
+             label_sort_lowest: Descendre en dernier
              button_login: Connexion
              button_submit: Soumettre
              button_back: Retour
              button_cancel: Annuler
              button_activate: Activer
+             button_sort: Trier
              text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
              text_regexp_info: ex. ^[A-Z0-9]+$

	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