jro_apps/redmine Commit - r2478:47f5713b1e1c

Reorder links refactoring (follows r2526)....

Jean-Philippe Lang -

r2478:47f5713b1e1c

parent child

Context file:

r2478:47f5713b1e1c

Collapse all files

app/controllers/boards_controller.rb 0 -6

             # 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 BoardsController < ApplicationController
               before_filter :find_project, :authorize
               helper :messages
               include MessagesHelper
               helper :sort
               include SortHelper
               helper :watchers
               include WatchersHelper
               def index
                 @boards = @project.boards
                 # show the board if there is only one
                 if @boards.size == 1
                   @board = @boards.first
                   show
                 end
               end
               def show
                 sort_init 'updated_on', 'desc'
                 sort_update	'created_on' => "#{Message.table_name}.created_on",
                             'replies' => "#{Message.table_name}.replies_count",
                             'updated_on' => "#{Message.table_name}.updated_on"
                 @topic_count = @board.topics.count
                 @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
                 @topics =  @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '),
                                               :include => [:author, {:last_reply => :author}],
                                               :limit  =>  @topic_pages.items_per_page,
                                               :offset =>  @topic_pages.current.offset
                 render :action => 'show', :layout => !request.xhr?
               end
               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
               def new
                 @board = Board.new(params[:board])
                 @board.project = @project
                 if request.post? && @board.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
                 end
               end
               def edit
                 if request.post? && @board.update_attributes(params[:board])
-                  case params[:position]
-                  when 'highest'; @board.move_to_top
-                  when 'higher'; @board.move_higher
-                  when 'lower'; @board.move_lower
-                  when 'lowest'; @board.move_to_bottom
-                  end if params[:position]
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
                 end
               end
               def destroy
                 @board.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
                 @board = @project.boards.find(params[:id]) if params[:id]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/custom_fields_controller.rb 0 -15

             # Redmine - project management software
             # Copyright (C) 2006-2009  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 CustomFieldsController < ApplicationController
               before_filter :require_admin
               def index
                 @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.class.name }
                 @tab = params[:tab] || 'IssueCustomField'
               end
               def new
                 @custom_field = begin
                   if params[:type].to_s.match(/.+CustomField$/)
                     params[:type].to_s.constantize.new(params[:custom_field])
                   end
                 rescue
                 end
                 redirect_to(:action => 'index') and return unless @custom_field.is_a?(CustomField)
                 if request.post? and @custom_field.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index', :tab => @custom_field.class.name
                 end
                 @trackers = Tracker.find(:all, :order => 'position')
               end
               def edit
                 @custom_field = CustomField.find(params[:id])
                 if request.post? and @custom_field.update_attributes(params[:custom_field])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'index', :tab => @custom_field.class.name
                 end
                 @trackers = Tracker.find(:all, :order => 'position')
               end
-              def move
-                @custom_field = CustomField.find(params[:id])
-                case params[:position]
-                when 'highest'
-                  @custom_field.move_to_top
-                when 'higher'
-                  @custom_field.move_higher
-                when 'lower'
-                  @custom_field.move_lower
-                when 'lowest'
-                  @custom_field.move_to_bottom
-                end if params[:position]
-                redirect_to :action => 'index', :tab => @custom_field.class.name
-              end
               def destroy
                 @custom_field = CustomField.find(params[:id]).destroy
                 redirect_to :action => 'index', :tab => @custom_field.class.name
               rescue
                 flash[:error] = "Unable to delete custom field"
                 redirect_to :action => 'index'
               end
             end

app/controllers/enumerations_controller.rb 0 -15

             # 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 EnumerationsController < ApplicationController
               before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
               verify :method => :post, :only => [ :destroy, :create, :update ],
                      :redirect_to => { :action => :list }
               def list
               end
               def new
                 @enumeration = Enumeration.new(:opt => params[:opt])
               end
               def create
                 @enumeration = Enumeration.new(params[:enumeration])
                 if @enumeration.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :opt => @enumeration.opt
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @enumeration = Enumeration.find(params[:id])
               end
               def update
                 @enumeration = Enumeration.find(params[:id])
                 if @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :opt => @enumeration.opt
                 else
                   render :action => 'edit'
                 end
               end
-              def move
-                @enumeration = Enumeration.find(params[:id])
-                case params[:position]
-                when 'highest'
-                  @enumeration.move_to_top
-                when 'higher'
-                  @enumeration.move_higher
-                when 'lower'
-                  @enumeration.move_lower
-                when 'lowest'
-                  @enumeration.move_to_bottom
-                end if params[:position]
-                redirect_to :action => 'index'
-              end
               def destroy
                 @enumeration = Enumeration.find(params[:id])
                 if !@enumeration.in_use?
                   # No associated objects
                   @enumeration.destroy
                   redirect_to :action => 'index'
                 elsif params[:reassign_to_id]
                   if reassign_to = Enumeration.find_by_opt_and_id(@enumeration.opt, params[:reassign_to_id])
                     @enumeration.destroy(reassign_to)
                     redirect_to :action => 'index'
                   end
                 end
                 @enumerations = Enumeration.values(@enumeration.opt) - [@enumeration]
               #rescue
               #  flash[:error] = 'Unable to delete enumeration'
               #  redirect_to :action => 'index'
               end
             end

app/controllers/issue_statuses_controller.rb 0 -15

             # 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 IssueStatusesController < ApplicationController
               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 => 25, :order => "position"
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 @issue_status = IssueStatus.new
               end
               def create
                 @issue_status = IssueStatus.new(params[:issue_status])
                 if @issue_status.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 else
                   render :action => 'new'
                 end
               end
               def edit
                 @issue_status = IssueStatus.find(params[:id])
               end
               def update
                 @issue_status = IssueStatus.find(params[:id])
                 if @issue_status.update_attributes(params[:issue_status])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 else
                   render :action => 'edit'
                 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'
               rescue
                 flash[:error] = "Unable to delete issue status"
                 redirect_to :action => 'list'
               end
             end

app/controllers/roles_controller.rb 0 -15

             # 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
               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 => 25, :order => 'builtin, position'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
                 # Prefills the form with 'Non member' role permissions
                 @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
                 if request.post? && @role.save
                   # workflow copy
                   if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
                     @role.workflows.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list'
                 end
                 @permissions = @role.setable_permissions
                 @roles = Role.find :all, :order => 'builtin, position'
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
                 @permissions = @role.setable_permissions
               end
               def destroy
                 @role = Role.find(params[:id])
                 @role.destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:error] = 'This role is in use and can not be deleted.'
                 redirect_to :action => 'index'
               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 report
                 @roles = Role.find(:all, :order => 'builtin, position')
                 @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
                 if request.post?
                   @roles.each do |role|
                     role.permissions = params[:permissions][role.id.to_s]
                     role.save
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list'
                 end
               end
             end

app/views/custom_fields/index.rhtml +1 -6

             <h2><%=l(:label_custom_field_plural)%></h2>
             <% selected_tab = params[:tab] ? params[:tab].to_s : custom_fields_tabs.first[:name] %>
             <div class="tabs">
             <ul>
             <% custom_fields_tabs.each do |tab| -%>
                 <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
                                                 :id => "tab-#{tab[:name]}",
                                                 :class => (tab[:name] != selected_tab ? nil : 'selected'),
                                                 :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
             <% end -%>
             </ul>
             </div>
             <% custom_fields_tabs.each do |tab| %>
             <div id="tab-content-<%= tab[:name] %>" class="tab-content" style="<%= tab[:name] != selected_tab ? 'display:none' : nil %>">
             <table class="list">
               <thead><tr>
             	<th width="30%"><%=l(:field_name)%></th>
             	<th><%=l(:field_field_format)%></th>
             	<th><%=l(:field_is_required)%></th>
             	<% if tab[:name] == 'IssueCustomField' %>
             	<th><%=l(:field_is_for_all)%></th>
             	<th><%=l(:label_used_by)%></th>
             	<% end %>
             	<th><%=l(:button_sort)%></th>
             	<th width="10%"></th>
               </tr></thead>
               <tbody>
             <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
             	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
             	<td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>
             	<% if tab[:name] == 'IssueCustomField' %>
             	<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
             	<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
             	<% end %>
-                <td align="center" style="width:15%;">
+                <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %></td>
-                    <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => custom_field, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
-                    <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => custom_field, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
-                    <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => custom_field, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
-                    <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => custom_field, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
-                </td>
             	<td align="center">
             	   <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
                 </td>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>
             </div>
             <% end %>
             <% html_title(l(:label_custom_field_plural)) -%>

app/views/enumerations/list.rhtml +1 -6

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration::OPTIONS.each do |option, params| %>
             <h3><%= l(params[:label]) %></h3>
             <% enumerations = Enumeration.values(option) %>
             <% if enumerations.any? %>
             <table class="list">
             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
                 <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
                 <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
-                <td style="width:15%;">
+                <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
-                <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => enumeration, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
-                <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => enumeration, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
-                <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => enumeration, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
-                <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => enumeration, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
-                </td>
                 <td align="center" style="width:10%;">
                 <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, :method => :post, :confirm => l(:text_are_you_sure), :class => "icon icon-del" %>
                 </td>
             </tr>
             <% end %>
             </table>
             <% reset_cycle %>
             <% end %>
             <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>

app/views/issue_statuses/list.rhtml +1 -6

             <div class="contextual">
             <%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_issue_status_plural)%></h2>
             <table class="list">
               <thead><tr>
               <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>
             <% for status in @issue_statuses %>
               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to status.name, :action => 'edit', :id => status %></td>
               <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" style="width:15%;">
+              <td align="center" style="width:15%;"><%= reorder_links('issue_status', {:action => 'update', :id => status}) %></td>
-                <%= 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" style="width:10%;">
                 <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
             <% html_title(l(:label_issue_status_plural)) -%>

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

             <% if @project.boards.any? %>
             <table class="list">
             	<thead><th><%= l(:label_board) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th><th style="width:15%"></th></thead>
             	<tbody>
             <% @project.boards.each do |board|
             	next if board.new_record? %>
             	<tr class="<%= cycle 'odd', 'even' %>">
                 <td><%=h board.name %></td>
                 <td><%=h board.description %></td>
                 <td align="center">
                 <% if authorize_for("boards", "edit") %>
-                <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
+            			<%= reorder_links('board', {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}) %>
-                <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
-                <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
-                <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
                 <% end %>
                 </td>
                 <td align="center"><%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %></td>
                 <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
             	</tr>
             <% end %>
                 </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project} %></p>

app/views/roles/list.rhtml +1 -4

             <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><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, :action => 'edit', :id => role)) %></td>
               <td align="center" style="width:15%;">
               <% unless role.builtin? %>
-                <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => role, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
+                <%= reorder_links('role', {:action => 'edit', :id => role}) %>
-                <%= 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) %>
               <% end %>
               </td>
               <td align="center" style="width:10%;">
                 <%= button_to(l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small", :disabled => role.builtin? ) %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @role_pages %></p>
             <p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
             <% html_title(l(:label_role_plural)) -%>

test/functional/roles_controller_test.rb +4 -4

             # 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 File.dirname(__FILE__) + '/../test_helper'
             require 'roles_controller'
             # Re-raise errors caught by the controller.
             class RolesController; def rescue_action(e) raise e end; end
             class RolesControllerTest < Test::Unit::TestCase
               fixtures :roles, :users, :members, :workflows
               def setup
                 @controller = RolesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_get_index
                 get :index
                 assert_response :success
                 assert_template 'list'
                 assert_not_nil assigns(:roles)
                 assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
                 assert_tag :tag => 'a', :attributes => { :href => '/roles/edit/1' },
                                         :content => 'Manager'
               end
               def test_get_new
                 get :new
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new_with_validaton_failure
                 post :new, :role => {:name => '',
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'}
                 assert_response :success
                 assert_template 'new'
                 assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' }
               end
               def test_post_new_without_workflow_copy
                 post :new, :role => {:name => 'RoleWithoutWorkflowCopy',
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'}
                 assert_redirected_to 'roles/list'
                 role = Role.find_by_name('RoleWithoutWorkflowCopy')
                 assert_not_nil role
                 assert_equal [:add_issues, :edit_issues, :log_time], role.permissions
                 assert !role.assignable?
               end
               def test_post_new_with_workflow_copy
                 post :new, :role => {:name => 'RoleWithWorkflowCopy',
                                      :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
                                      :assignable => '0'},
                            :copy_workflow_from => '1'
                 assert_redirected_to 'roles/list'
                 role = Role.find_by_name('RoleWithWorkflowCopy')
                 assert_not_nil role
                 assert_equal Role.find(1).workflows.size, role.workflows.size
               end
               def test_get_edit
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_equal Role.find(1), assigns(:role)
               end
               def test_post_edit
                 post :edit, :id => 1,
                             :role => {:name => 'Manager',
                                       :permissions => ['edit_project', ''],
                                       :assignable => '0'}
                 assert_redirected_to 'roles/list'
                 role = Role.find(1)
                 assert_equal [:edit_project], role.permissions
               end
               def test_destroy
                 r = Role.new(:name => 'ToBeDestroyed', :permissions => [:view_wiki_pages])
                 assert r.save
                 post :destroy, :id => r
                 assert_redirected_to 'roles/list'
                 assert_nil Role.find_by_id(r.id)
               end
               def test_destroy_role_in_use
                 post :destroy, :id => 1
                 assert_redirected_to 'roles'
                 assert flash[:error] == 'This role is in use and can not be deleted.'
                 assert_not_nil Role.find_by_id(1)
               end
               def test_get_report
                 get :report
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:roles)
                 assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'permissions[3][]',
                                                              :value => 'add_issues',
                                                              :checked => 'checked' }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'permissions[3][]',
                                                              :value => 'delete_issues',
                                                              :checked => nil }
               end
               def test_post_report
                 post :report, :permissions => { '0' => '', '1' => ['edit_issues'], '3' => ['add_issues', 'delete_issues']}
                 assert_redirected_to 'roles/list'
                 assert_equal [:edit_issues], Role.find(1).permissions
                 assert_equal [:add_issues, :delete_issues], Role.find(3).permissions
                 assert Role.find(2).permissions.empty?
               end
               def test_clear_all_permissions
                 post :report, :permissions => { '0' => '' }
                 assert_redirected_to 'roles/list'
                 assert Role.find(1).permissions.empty?
               end
               def test_move_highest
-                post :move, :id => 3, :position => 'highest'
+                post :edit, :id => 3, :role => {:move_to => 'highest'}
                 assert_redirected_to 'roles/list'
                 assert_equal 1, Role.find(3).position
               end
               def test_move_higher
                 position = Role.find(3).position
-                post :move, :id => 3, :position => 'higher'
+                post :edit, :id => 3, :role => {:move_to => 'higher'}
                 assert_redirected_to 'roles/list'
                 assert_equal position - 1, Role.find(3).position
               end
               def test_move_lower
                 position = Role.find(2).position
-                post :move, :id => 2, :position => 'lower'
+                post :edit, :id => 2, :role => {:move_to => 'lower'}
                 assert_redirected_to 'roles/list'
                 assert_equal position + 1, Role.find(2).position
               end
               def test_move_lowest
-                post :move, :id => 2, :position => 'lowest'
+                post :edit, :id => 2, :role => {:move_to => 'lowest'}
                 assert_redirected_to 'roles/list'
                 assert_equal Role.count, Role.find(2).position
               end
             end

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