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

                  @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

app/controllers/roles_controller.rb +20 -2

              class RolesController < ApplicationController
                layout 'base'
                before_filter :require_admin
+               verify :method => :post, :only => [ :destroy, :move ],
+                      :redirect_to => { :action => :list }
                def index
                  list
                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
                  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])
                      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

app/controllers/users_controller.rb +1 -1

                    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

app/models/role.rb +1 0

                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

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>

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

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

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

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

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

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