jro_apps/redmine Commit - r205:671a0fa10161

added the ability to set the sort order for roles...

Jean-Philippe Lang -

r205:671a0fa10161

parent child

Context file:

r205:671a0fa10161

Collapse all files

db/migrate/020_add_role_position.rb created 644 +10 0

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

app/controllers/projects_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'csv'
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(:all, :conditions => ["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if params[:repository_enabled] && params[:repository_enabled] == "1"
                     @project.repository = Repository.new
                     @project.repository.attributes = params[:repository]
                   end
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @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)
                 @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
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
-                @roles = Role.find(:all)
+                @roles = Role.find(:all, :order => 'position')
                 @users = User.find_active(:all) - @project.users
                 @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if params[:repository_enabled]
                     case params[:repository_enabled]
                     when "0"
                       @project.repository = nil
                     when "1"
                       @project.repository ||= Repository.new
                       @project.repository.attributes = params[:repository]
                     end
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :tab => 'categories', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :tab => 'members', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   # Save the attachments
                   params[:attachments].each { |a|
                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :action => 'list_documents', :id => @project
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents.find :all, :include => :category
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @issue.start_date = Date.today
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Multiple file upload
                   @attachments = []
                   params[:attachments].each { |a|
                     @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     @attachments.each(&:save)
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 @results_per_page_options = [ 15, 25, 50, 100 ]
                 if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
                   @results_per_page = params[:per_page].to_i
                   session[:results_per_page] = @results_per_page
                 else
                   @results_per_page = session[:results_per_page] || 25
                 end
                 if @query.valid?
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :author, :status, :tracker, :project ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
                 @trackers = Tracker.find :all
                 render :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
             						:conditions => @query.statement
                 ic = Iconv.new('ISO-8859-1', 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#", l(:field_status),
                                    l(:field_tracker),
                                    l(:field_priority),
                                    l(:field_subject),
                                    l(:field_author),
                                    l(:field_start_date),
                                    l(:field_due_date),
                                    l(:field_done_ratio),
                                    l(:field_created_on),
                                    l(:field_updated_on)
                                    ]
                   for custom_field in @project.all_custom_fields
                     headers << custom_field.name
                   end
                   csv << headers.collect {|c| ic.iconv(c) }
                   # csv lines
                   @issues.each do |issue|
                     fields = [issue.id, issue.status.name,
                                         issue.tracker.name,
                                         issue.priority.name,
                                         issue.subject,
                                         issue.author.display_name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                                         issue.due_date ? l_date(issue.due_date) : nil,
                                         issue.done_ratio,
                                         l_datetime(issue.created_on),
                                         l_datetime(issue.updated_on)
                                         ]
                     for custom_field in @project.all_custom_fields
                       fields << (show_value issue.custom_value_for(custom_field))
                     end
                     csv << fields.collect {|c| ic.iconv(c.to_s) }
                   end
                 end
                 export.rewind
                 send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
               end
               # Export filtered/sorted issues to PDF
               def export_issues_pdf
                 sort_init 'issues.id', 'desc'
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
             						:conditions => @query.statement
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
                 render :layout => false
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :action => 'list_issues', :id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role_id)}
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? and params[:new_project_id] and params[:new_tracker_id]
                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
                     # project dependent properties
                     unless i.project_id == new_project.id
                       i.category = nil
                       i.fixed_version = nil
                     end
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker
                     i.save
                   }
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list_issues', :id => @project
                 end
               end
               def add_query
                 @query = Query.new(params[:query])
                 @query.project = @project
                 @query.user = logged_in_user
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                 end if params[:fields]
                 if request.post? and @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
                 end
                 render :layout => false if request.xhr?
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   # Save the attachments
                   @attachments = []
                   params[:attachments].each { |file|
                     next unless file.size > 0
                     a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
                     @attachments << a unless a.new_record?
                   } if params[:attachments] and params[:attachments].is_a? Array
                   Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
                   :order => "versions.effective_date DESC, issues.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def activity
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 @events_by_day = {}
                 unless params[:show_issues] == "0"
                   @project.issues.find(:all, :include => [:author, :status], :conditions => ["issues.created_on>=? and issues.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_issues = 1
                 end
                 unless params[:show_news] == "0"
                   @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_news = 1
                 end
                 unless params[:show_files] == "0"
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_files = 1
                 end
                 unless params[:show_documents] == "0"
                   @project.documents.find(:all, :conditions => ["documents.created_on>=? and documents.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 # start on monday
                 @date_from = @date_from - (@date_from.cwday-1)
                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
                 @issues = @project.issues.find(:all, :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
                 render :layout => false if request.xhr?
               end
               def gantt
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= (Date.today << 1).month
                   @year_from ||= (Date.today << 1).year
                 end
                 @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
                 @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @issues = @project.issues.find(:all, :order => "start_date, due_date", :include => [:tracker, :status, :assigned_to, :priority], :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
                 @html_title = @project.name
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = @project.queries.find(params[:query_id])
                   session[:query] = @query
                 else
                   if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = @query
                   else
                     @query = session[:query]
                   end
                 end
               end
             end

app/controllers/roles_controller.rb +20 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RolesController < ApplicationController
               layout 'base'
               before_filter :require_admin
+              verify :method => :post, :only => [ :destroy, :move ],
+                     :redirect_to => { :action => :list }
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
-                @role_pages, @roles = paginate :roles, :per_page => 10
+                @role_pages, @roles = paginate :roles, :per_page => 10, :order => "position"
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @role = Role.new(params[:role])
                 if request.post?
                   @role.permissions = Permission.find(params[:permission_ids]) if params[:permission_ids]
                   if @role.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
               end
               def destroy
                 @role = Role.find(params[:id])
                 unless @role.members.empty?
                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
                 else
                   @role.destroy
                 end
                 redirect_to :action => 'list'
               end
+              def move
+                @role = Role.find(params[:id])
+                case params[:position]
+                when 'highest'
+                  @role.move_to_top
+                when 'higher'
+                  @role.move_higher
+                when 'lower'
+                  @role.move_lower
+                when 'lowest'
+                  @role.move_to_bottom
+                end if params[:position]
+                redirect_to :action => 'list'
+              end
               def workflow
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = l(:notice_successful_update)
                   end
                 end
-                @roles = Role.find :all
+                @roles = Role.find(:all, :order => 'position')
                 @trackers = Tracker.find :all
                 @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
               end
             end

app/controllers/users_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class UsersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @user_count = User.count
                 @user_pages = Paginator.new self, @user_count,
 ,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => Setting.default_language)
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                   @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                   @user.custom_values = @custom_values
                   if @user.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.get?
                   @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 else
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
                   if params[:custom_fields]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                   end
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
-                @roles = Role.find :all
+                @roles = Role.find(:all, :order => 'position')
                 @projects = Project.find(:all) - @user.projects
                 @membership ||= Member.new
               end
               def edit_membership
                 @user = User.find(params[:id])
                 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
                 @membership.attributes = params[:membership]
                 if request.post? and @membership.save
                   flash[:notice] = l(:notice_successful_update)
                 end
                 redirect_to :action => 'edit', :id => @user and return
               end
               def destroy_membership
                 @user = User.find(params[:id])
                 if request.post? and Member.find(params[:membership_id]).destroy
                   flash[:notice] = l(:notice_successful_update)
                 end
                 redirect_to :action => 'edit', :id => @user and return
               end
               def destroy
                 User.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete user"
                 redirect_to :action => 'list'
               end
             end

app/models/role.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Role < ActiveRecord::Base
               before_destroy :check_integrity
               has_and_belongs_to_many :permissions
               has_many :workflows, :dependent => :delete_all
               has_many :members
+              acts_as_list
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_format_of :name, :with => /^[\w\s\'\-]*$/i
             private
               def check_integrity
                 raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
               end
             end

app/views/projects/list_members.rhtml +2 -2

             <h2><%=l(:label_member_plural)%></h2>
             <% members = @members.group_by {|m| m.role } %>
-            <% members.each do |role, member| %>
+            <% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %>
             <h3><%= role.name %></h3>
             <ul>
-            <% member.each do |m| %>
+            <% members[role].each do |m| %>
             <li><%= link_to m.user.display_name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
             <% end %>
             </ul>
             <% end %>

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

             <h2><%=l(:label_settings)%></h2>
             <div class="tabs">
             <ul>
             <li><%= link_to l(:label_information_plural), {}, :id=> "tab-info", :onclick => "showTab('info'); this.blur(); return false;" %></li>
             <li><%= link_to l(:label_member_plural), {}, :id=> "tab-members", :onclick => "showTab('members'); this.blur(); return false;" %></li>
             <li><%= link_to l(:label_version_plural), {}, :id=> "tab-versions", :onclick => "showTab('versions'); this.blur(); return false;" %></li>
             <li><%= link_to l(:label_issue_category_plural), {}, :id=> "tab-categories", :onclick => "showTab('categories'); this.blur(); return false;" %></li>
             </ul>
             </div>
             <div id="tab-content-info" class="tab-content">
             <% if authorize_for('projects', 'edit') %>
             	<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
             	<%= render :partial => 'form', :locals => { :f => f } %>
             	<%= submit_tag l(:button_save) %>
             	<% end %>
             <% end %>
             </div>
             <div id="tab-content-members" class="tab-content" style="display:none;">
             <%= error_messages_for 'member' %>
             <table class="list">
             	<thead><th><%= l(:label_user) %></th><th><%= l(:label_role) %></th><th></th></thead>
             	<tbody>
-            	<% for member in @project.members.find(:all, :include => :user) %>
+            	<% @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position}.each do |member| %>
             	<% unless member.new_record? %>
             	<tr class="<%= cycle 'odd', 'even' %>">
             	<td><%= member.user.display_name %></td>
                 <td align="center">
                     <% if authorize_for('members', 'edit') %>
                     <% form_tag({:controller => 'members', :action => 'edit', :id => member}) do %>
                     <select name="member[role_id]">
                     <%= options_from_collection_for_select @roles, "id", "name", member.role_id %>
                     </select>
                     <%= submit_tag l(:button_change), :class => "button-small" %>
                     <% end %>
                     <% end %>
                 </td>
                 <td align="center">
                     <%= link_to_if_authorized l(:button_delete), {:controller => 'members', :action => 'destroy', :id => member}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                 </td>
             	</tr>
             	<% end %>
             	</tbody>
             <% end; reset_cycle %>
             </table>
             <% if authorize_for('projects', 'add_member') %>
                 <label><%=l(:label_member_new)%></label><br/>
                 <% form_tag({:controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project}) do %>
                 <select name="member[user_id]">
                 <%= options_from_collection_for_select @users, "id", "display_name", @member.user_id %>
                 </select>
                 <select name="member[role_id]">
                 <%= options_from_collection_for_select @roles, "id", "name", @member.role_id %>
                 </select>
                 <%= submit_tag l(:button_add) %>
                 <% end %>
             <% end %>
             </div>
             <div id="tab-content-versions" class="tab-content" style="display:none;">
             <table class="list">
             	<thead><th><%= l(:label_version) %></th><th><%= l(:field_effective_date) %></th><th><%= l(:field_description) %></th><th></th><th></th></thead>
             	<tbody>
             <% for version in @project.versions %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                 <td><strong><%=h version.name %></strong></td>
                 <td align="center"><%= format_date(version.effective_date) %></td>
                 <td><%=h version.description %></td>
                 <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
                 <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
                 </td>
                 </tr>
             <% end; reset_cycle %>
                 </tbody>
             </table>
             <%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %>
             </div>
             <div id="tab-content-categories" class="tab-content" style="display:none;">
             <table class="list">
             	<thead><th><%= l(:label_issue_category) %></th><th></th></thead>
             	<tbody>
             <% for @category in @project.issue_categories %>
             	<% unless @category.new_record? %>
             	<tr class="<%= cycle 'odd', 'even' %>">
                 <td>
                     <% form_tag({:controller => 'issue_categories', :action => 'edit', :id => @category}) do %>
                     <%= text_field 'category', 'name', :size => 25  %>
                     <% if authorize_for('issue_categories', 'edit') %>
                     <%= submit_tag l(:button_save), :class => "button-small" %>
                     <% end %>
                     <% end %>
                 </td>
                 <td align="center">
                     <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                 </td>
             	</tr>
             	<% end %>
             <% end %>
                 </tbody>
             </table>
             <% if authorize_for('projects', 'add_issue_category') %>
                 <% form_tag({:action => 'add_issue_category', :tab => 'categories', :id => @project}) do %>
                 <label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br/>
                 <%= error_messages_for 'issue_category' %>
                 <%= text_field 'issue_category', 'name', :size => 25 %>
                 <%= submit_tag l(:button_create) %>
                 <% end %>
             <% end %>
             </div>
             <%= tab = params[:tab] ? h(params[:tab]) : 'info'
             javascript_tag "showTab('#{tab}');" %>

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

             <div class="contextual">
             <%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_role_plural)%></h2>
             <table class="list">
               <thead><tr>
                 <th><%=l(:label_role)%></th>
+                <th><%=l(:button_sort)%></th>
             	<th></th>
               </tr></thead>
               <tbody>
             <% for role in @roles %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to role.name, :action => 'edit', :id => role %></td>
               <td align="center">
+                <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => role, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
+                <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => role, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
+                <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => role, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
+                <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => role, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
+              </td>
+              <td align="center">
                 <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
               </tr>
             <% end %>
               </tbody>
             </table>
             <%= pagination_links_full @role_pages %>

doc/CHANGELOG +1 -1

             == redMine changelog
             redMine - project management software
             Copyright (C) 2006-2007  Jean-Philippe Lang
             http://redmine.rubyforge.org/
             == xx/xx/2006 v0.4.2
             * Rails 1.2 is now required
             * 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
+            * ability to set the sort order for roles, 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
             * project settings screen split in 4 tabs
             * fixed: subprojects count is always 0 on projects list
             * fixed: setting an issue status as default status leads to an sql error with SQLite
             * fixed: unable to delete an issue status even if it's not used yet
             * fixed: filters ignored when exporting a predefined query to csv/pdf
             == 01/03/2006 v0.4.1
             * fixed: emails have no recipient when one of the project members has notifications disabled
             == 01/02/2006 v0.4.0
             * simple SVN browser added (just needs svn binaries in PATH)
             * comments can now be added on news
             * "my page" is now customizable
             * more powerfull and savable filters for issues lists
             * improved issues change history
             * new functionality: move an issue to another project or tracker
             * new functionality: add a note to an issue
             * new report: project activity
             * "start date" and "% done" fields added on issues
             * project calendar added
             * gantt chart added (exportable to pdf)
             * single/multiple issues pdf export added
             * issues reports improvements
             * multiple file upload for issues, documents and files
             * option to set maximum size of uploaded files
             * textile formating of issue and news descritions (RedCloth required)
             * integration of DotClear jstoolbar for textile formatting
             * calendar date picker for date fields (LGPL DHTML Calendar http://sourceforge.net/projects/jscalendar)
             * new filter in issues list: Author
             * ajaxified paginators
             * news rss feed added
             * option to set number of results per page on issues list
             * localized csv separator (comma/semicolon)
             * csv output encoded to ISO-8859-1
             * user custom field displayed on account/show
             * default configuration improved (default roles, trackers, status, permissions and workflows)
             * language for default configuration data can now be chosen when running 'load_default_data' task
             * javascript added on custom field form to show/hide fields according to the format of custom field
             * fixed: custom fields not in csv exports
             * fixed: project settings now displayed according to user's permissions
             * fixed: application error when no version is selected on projects/add_file
             * fixed: public actions not authorized for members of non public projects
             * fixed: non public projects were shown on welcome screen even if current user is not a member
             == 10/08/2006 v0.3.0
             * user authentication against multiple LDAP (optional)
             * token based "lost password" functionality
             * user self-registration functionality (optional)
             * custom fields now available for issues, users and projects
             * new custom field format "text" (displayed as a textarea field)
             * project & administration drop down menus in navigation bar for quicker access
             * text formatting is preserved for long text fields (issues, projects and news descriptions)
             * urls and emails are turned into clickable links in long text fields
             * "due date" field added on issues
             * tracker selection filter added on change log
             * Localization plugin replaced with GLoc 1.1.0 (iconv required)
             * error messages internationalization
             * german translation added (thanks to Karim Trott)
             * data locking for issues to prevent update conflicts (using ActiveRecord builtin optimistic locking)
             * new filter in issues list: "Fixed version"
             * active filters are displayed with colored background on issues list
             * custom configuration is now defined in config/config_custom.rb
             * user object no more stored in session (only user_id)
             * news summary field is no longer required
             * tables and forms redesign
             * Fixed: boolean custom field not working
             * Fixed: error messages for custom fields are not displayed
             * Fixed: invalid custom fields should have a red border
             * Fixed: custom fields values are not validated on issue update
             * Fixed: unable to choose an empty value for 'List' custom fields
             * Fixed: no issue categories sorting
             * Fixed: incorrect versions sorting
             == 07/12/2006 - v0.2.2
             * Fixed: bug in "issues list"
             == 07/09/2006 - v0.2.1
             * new databases supported: Oracle, PostgreSQL, SQL Server
             * projects/subprojects hierarchy (1 level of subprojects only)
             * environment information display in admin/info
             * more filter options in issues list (rev6)
             * default language based on browser settings (Accept-Language HTTP header)
             * issues list exportable to CSV (rev6)
             * simple_format and auto_link on long text fields
             * more data validations
             * Fixed: error when all mail notifications are unchecked in admin/mail_options
             * Fixed: all project news are displayed on project summary
             * Fixed: Can't change user password in users/edit
             * Fixed: Error on tables creation with PostgreSQL (rev5)
             * Fixed: SQL error in "issue reports" view with PostgreSQL (rev5)
             == 06/25/2006 - v0.1.0
             * multiple users/multiple projects
             * role based access control
             * issue tracking system
             * fully customizable workflow
             * documents/files repository
             * email notifications on issue creation and update
             * multilanguage support (except for error messages):english, french, spanish
             * online manual in french (unfinished)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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