jro_apps/redmine Commit - r2462:589320337db0

Trackers controller refactoring....

Jean-Philippe Lang -

r2462:589320337db0

parent child

Context file:

r2462:589320337db0

Collapse all files

app/controllers/trackers_controller.rb +4 -20

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # 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
                 list
                 render :action => 'list' unless request.xhr?
               end
-              # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+              verify :method => :post, :only => :destroy, :redirect_to => { :action => :list }
-              verify :method => :post, :only => [ :destroy, :move ], :redirect_to => { :action => :list }
               def list
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
                 end
                 @projects = Project.find(:all)
               end
-              def move
-                @tracker = Tracker.find(params[:id])
-                case params[:position]
-                when 'highest'
-                  @tracker.move_to_top
-                when 'higher'
-                  @tracker.move_higher
-                when 'lower'
-                  @tracker.move_lower
-                when 'lowest'
-                  @tracker.move_to_bottom
-                end if params[:position]
-                redirect_to :action => 'list'
-              end
               def destroy
                 @tracker = Tracker.find(params[:id])

app/helpers/application_helper.rb +7 0

                 end
                 links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
               end
+              def reorder_links(name, url)
+                link_to(image_tag('2uparrow.png',   :alt => l(:label_sort_highest)), url.merge({"#{name}[move_to]" => 'highest'}), :method => :post, :title => l(:label_sort_highest)) +
+                link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),  url.merge({"#{name}[move_to]" => 'higher'}),  :method => :post, :title => l(:label_sort_higher)) +
+                link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),   url.merge({"#{name}[move_to]" => 'lower'}),   :method => :post, :title => l(:label_sort_lower)) +
+                link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),  url.merge({"#{name}[move_to]" => 'lowest'}),  :method => :post, :title => l(:label_sort_lowest))
+              end
               def breadcrumb(*args)
                 elements = args.flatten

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

               <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
               <td align="center"><% unless tracker.workflows.count > 0 %><span class="icon icon-warning"><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)</span><% end %></td>
-              <td align="center" style="width:15%;">
+              <td align="center" style="width:15%;"><%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %></td>
-                <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => tracker, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
-                <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => tracker, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
-                <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => tracker, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
-                <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => tracker, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
-              </td>
               <td align="center" style="width:10%;">
                 <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
               </td>

test/functional/trackers_controller_test.rb +52 -1

@@ -22,7 +22,7 require 'trackers_controller'
22	class TrackersController; def rescue_action(e) raise e end; end	22	class TrackersController; def rescue_action(e) raise e end; end
23		23
24	class TrackersControllerTest < Test::Unit::TestCase	24	class TrackersControllerTest < Test::Unit::TestCase
25	fixtures :trackers, :projects, :projects_trackers, :users	25	fixtures :trackers, :projects, :projects_trackers, :users, :issues
26		26
27	def setup	27	def setup
28	@controller = TrackersController.new	28	@controller = TrackersController.new
@@ -32,6 +32,34 class TrackersControllerTest < Test::Unit::TestCase
32	@request.session[:user_id] = 1 # admin	32	@request.session[:user_id] = 1 # admin
33	end	33	end
34		34
		35	def test_index
		36	get :index
		37	assert_response :success
		38	assert_template 'list'
		39	end
		40
		41	def test_get_new
		42	get :new
		43	assert_response :success
		44	assert_template 'new'
		45	end
		46
		47	def test_post_new
		48	post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''] }
		49	assert_redirected_to '/trackers/list'
		50	tracker = Tracker.find_by_name('New tracker')
		51	assert_equal [1], tracker.project_ids.sort
		52	assert_equal 0, tracker.workflows.count
		53	end
		54
		55	def test_post_new_with_workflow_copy
		56	post :new, :tracker => { :name => 'New tracker' }, :copy_workflow_from => 1
		57	assert_redirected_to '/trackers/list'
		58	tracker = Tracker.find_by_name('New tracker')
		59	assert_equal 0, tracker.projects.count
		60	assert_equal Tracker.find(1).workflows.count, tracker.workflows.count
		61	end
		62
35	def test_get_edit	63	def test_get_edit
36	Tracker.find(1).project_ids = [1, 3]	64	Tracker.find(1).project_ids = [1, 3]
37		65
@@ -65,4 +93,27 class TrackersControllerTest < Test::Unit::TestCase
65	assert_redirected_to '/trackers/list'	93	assert_redirected_to '/trackers/list'
66	assert Tracker.find(1).project_ids.empty?	94	assert Tracker.find(1).project_ids.empty?
67	end	95	end
		96
		97	def test_move_lower
		98	tracker = Tracker.find_by_position(1)
		99	post :edit, :id => 1, :tracker => { :move_to => 'lower' }
		100	assert_equal 2, tracker.reload.position
		101	end
		102
		103	def test_destroy
		104	tracker = Tracker.create!(:name => 'Destroyable')
		105	assert_difference 'Tracker.count', -1 do
		106	post :destroy, :id => tracker.id
		107	end
		108	assert_redirected_to '/trackers/list'
		109	assert_nil flash[:error]
		110	end
		111
		112	def test_destroy_tracker_in_use
		113	assert_no_difference 'Tracker.count' do
		114	post :destroy, :id => 1
		115	end
		116	assert_redirected_to '/trackers/list'
		117	assert_not_nil flash[:error]
		118	end
68	end	119	end

vendor/plugins/acts_as_list/lib/active_record/acts/list.rb +14 0

@@ -118,6 +118,20 module ActiveRecord
118	assume_top_position	118	assume_top_position
119	end	119	end
120	end	120	end
		121
		122	# Move to the given position
		123	def move_to=(pos)
		124	case pos.to_s
		125	when 'highest'
		126	move_to_top
		127	when 'higher'
		128	move_higher
		129	when 'lower'
		130	move_lower
		131	when 'lowest'
		132	move_to_bottom
		133	end
		134	end
121		135
122	# Removes the item from the list.	136	# Removes the item from the list.
123	def remove_from_list	137	def remove_from_list

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