Refactor: Merged TrackersController#list and #index

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3437 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis
2010-02-15 16:41:27 +00:00
parent c5f30fde28
commit 49bfee0535
3 changed files with 13 additions and 18 deletions
+6 -11
View File
@@ -20,16 +20,11 @@ class TrackersController < ApplicationController
before_filter :require_admin
def index
list
render :action => 'list' unless request.xhr?
end
verify :method => :post, :only => :destroy, :redirect_to => { :action => :list }
verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
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
@@ -40,7 +35,7 @@ class TrackersController < ApplicationController
@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'
@@ -51,7 +46,7 @@ class TrackersController < ApplicationController
@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)
@@ -64,6 +59,6 @@ class TrackersController < ApplicationController
else
@tracker.destroy
end
redirect_to :action => 'list'
redirect_to :action => 'index'
end
end