jro_apps/redmine Commit - r2478:47f5713b1e1c

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

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

               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

@@ -47,21 +47,6 class CustomFieldsController < ApplicationController
47	end	47	end
48	@trackers = Tracker.find(:all, :order => 'position')	48	@trackers = Tracker.find(:all, :order => 'position')
49	end	49	end
50
51	def move
52	@custom_field = CustomField.find(params[:id])
53	case params[:position]
54	when 'highest'
55	@custom_field.move_to_top
56	when 'higher'
57	@custom_field.move_higher
58	when 'lower'
59	@custom_field.move_lower
60	when 'lowest'
61	@custom_field.move_to_bottom
62	end if params[:position]
63	redirect_to :action => 'index', :tab => @custom_field.class.name
64	end
65		50
66	def destroy	51	def destroy
67	@custom_field = CustomField.find(params[:id]).destroy	52	@custom_field = CustomField.find(params[:id]).destroy

@@ -57,21 +57,6 class EnumerationsController < ApplicationController
57	render :action => 'edit'	57	render :action => 'edit'
58	end	58	end
59	end	59	end
60
61	def move
62	@enumeration = Enumeration.find(params[:id])
63	case params[:position]
64	when 'highest'
65	@enumeration.move_to_top
66	when 'higher'
67	@enumeration.move_higher
68	when 'lower'
69	@enumeration.move_lower
70	when 'lowest'
71	@enumeration.move_to_bottom
72	end if params[:position]
73	redirect_to :action => 'index'
74	end
75		60
76	def destroy	61	def destroy
77	@enumeration = Enumeration.find(params[:id])	62	@enumeration = Enumeration.find(params[:id])

@@ -58,21 +58,6 class IssueStatusesController < ApplicationController
58	render :action => 'edit'	58	render :action => 'edit'
59	end	59	end
60	end	60	end
61
62	def move
63	@issue_status = IssueStatus.find(params[:id])
64	case params[:position]
65	when 'highest'
66	@issue_status.move_to_top
67	when 'higher'
68	@issue_status.move_higher
69	when 'lower'
70	@issue_status.move_lower
71	when 'lowest'
72	@issue_status.move_to_bottom
73	end if params[:position]
74	redirect_to :action => 'list'
75	end
76		61
77	def destroy	62	def destroy
78	IssueStatus.find(params[:id]).destroy	63	IssueStatus.find(params[:id]).destroy

@@ -64,21 +64,6 class RolesController < ApplicationController
64	redirect_to :action => 'index'	64	redirect_to :action => 'index'
65	end	65	end
66		66
67	def move
68	@role = Role.find(params[:id])
69	case params[:position]
70	when 'highest'
71	@role.move_to_top
72	when 'higher'
73	@role.move_higher
74	when 'lower'
75	@role.move_lower
76	when 'lowest'
77	@role.move_to_bottom
78	end if params[:position]
79	redirect_to :action => 'list'
80	end
81
82	def report	67	def report
83	@roles = Role.find(:all, :order => 'builtin, position')	68	@roles = Role.find(:all, :order => 'builtin, position')
84	@permissions = Redmine::AccessControl.permissions.select { \|p\| !p.public? }	69	@permissions = Redmine::AccessControl.permissions.select { \|p\| !p.public? }

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

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

                 <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><%= 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%;">

               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