jro_apps/redmine Commit - r3323:49bfee053593

Refactor: Merged TrackersController#list and #index...

Eric Davis -

r3323:49bfee053593

parent child

Context file:

r3323:49bfee053593

Collapse all files

app/controllers/trackers_controller.rb +6 -11

               before_filter :require_admin
-              def index
+              verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
-                list
-                render :action => 'list' unless request.xhr?
-              end
-              verify :method => :post, :only => :destroy, :redirect_to => { :action => :list }
-              def list
+              def index
                 @tracker_pages, @trackers = paginate :trackers, :per_page => 10, :order => 'position'
-                render :action => "list", :layout => false if request.xhr?
+                render :action => "index", :layout => false if request.xhr?
               end
               def new
                     @tracker.workflows.copy(copy_from)
                   end
                   flash[:notice] = l(:notice_successful_create)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                   return
                 end
                 @trackers = Tracker.find :all, :order => 'position'
                 @tracker = Tracker.find(params[:id])
                 if request.post? and @tracker.update_attributes(params[:tracker])
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to :action => 'list'
+                  redirect_to :action => 'index'
                   return
                 end
                 @projects = Project.find(:all)
                 else
                   @tracker.destroy
                 end
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               end
             end

app/views/trackers/index.html.erb ~~app/views/trackers/list.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/trackers/list.rhtml to app/views/trackers/index.html.erb

test/functional/trackers_controller_test.rb +7 -7

               def test_index
                 get :index
                 assert_response :success
-                assert_template 'list'
+                assert_template 'index'
               end
               def test_get_new
               def test_post_new
                 post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
-                assert_redirected_to '/trackers/list'
+                assert_redirected_to :action => 'index'
                 tracker = Tracker.find_by_name('New tracker')
                 assert_equal [1], tracker.project_ids.sort
                 assert_equal [1, 6], tracker.custom_field_ids
               def test_post_new_with_workflow_copy
                 post :new, :tracker => { :name => 'New tracker' }, :copy_workflow_from => 1
-                assert_redirected_to '/trackers/list'
+                assert_redirected_to :action => 'index'
                 tracker = Tracker.find_by_name('New tracker')
                 assert_equal 0, tracker.projects.count
                 assert_equal Tracker.find(1).workflows.count, tracker.workflows.count
               def test_post_edit
                 post :edit, :id => 1, :tracker => { :name => 'Renamed',
                                                     :project_ids => ['1', '2', ''] }
-                assert_redirected_to '/trackers/list'
+                assert_redirected_to :action => 'index'
                 assert_equal [1, 2], Tracker.find(1).project_ids.sort
               end
               def test_post_edit_without_projects
                 post :edit, :id => 1, :tracker => { :name => 'Renamed',
                                                     :project_ids => [''] }
-                assert_redirected_to '/trackers/list'
+                assert_redirected_to :action => 'index'
                 assert Tracker.find(1).project_ids.empty?
               end
                 assert_difference 'Tracker.count', -1 do
                   post :destroy, :id => tracker.id
                 end
-                assert_redirected_to '/trackers/list'
+                assert_redirected_to :action => 'index'
                 assert_nil flash[:error]
               end
                 assert_no_difference 'Tracker.count' do
                   post :destroy, :id => 1
                 end
-                assert_redirected_to '/trackers/list'
+                assert_redirected_to :action => 'index'
                 assert_not_nil flash[:error]
               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