jro_apps/redmine Commit - r3301:c18f8d34fb3d

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

Eric Davis -

r3301:c18f8d34fb3d

parent child

Context file:

r3301:c18f8d34fb3d

Collapse all files

app/controllers/issue_statuses_controller.rb +7 -12

             # 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
               layout 'admin'
               before_filter :require_admin
               verify :method => :post, :only => [ :destroy, :create, :update, :move, :update_issue_done_ratio ],
-                     :redirect_to => { :action => :list }
+                     :redirect_to => { :action => :index }
               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?
+                render :action => "index", :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'
+                  redirect_to :action => 'index'
                 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'
+                  redirect_to :action => 'index'
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 IssueStatus.find(params[:id]).destroy
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               rescue
                 flash[:error] = "Unable to delete issue status"
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               end
               def update_issue_done_ratio
                 if IssueStatus.update_issue_done_ratios
                   flash[:notice] = l(:notice_issue_done_ratios_updated)
                 else
                   flash[:error] =  l(:error_issue_done_ratios_not_updated)
                 end
-                redirect_to :action => 'list'
+                redirect_to :action => 'index'
               end
             end

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

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

test/functional/issue_statuses_controller_test.rb +7 -8

             require File.dirname(__FILE__) + '/../test_helper'
             require 'issue_statuses_controller'
             # Re-raise errors caught by the controller.
             class IssueStatusesController; def rescue_action(e) raise e end; end
             class IssueStatusesControllerTest < ActionController::TestCase
               fixtures :issue_statuses, :issues
               def setup
                 @controller = IssueStatusesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
-                # TODO: unify with #list
                 get :index
                 assert_response :success
-                assert_template 'list'
+                assert_template 'index'
               end
               def test_new
                 get :new
                 assert_response :success
                 assert_template 'new'
               end
               def test_create
                 assert_difference 'IssueStatus.count' do
                   post :create, :issue_status => {:name => 'New status'}
                 end
-                assert_redirected_to 'issue_statuses/list'
+                assert_redirected_to :action => 'index'
                 status = IssueStatus.find(:first, :order => 'id DESC')
                 assert_equal 'New status', status.name
               end
               def test_edit
                 get :edit, :id => '3'
                 assert_response :success
                 assert_template 'edit'
               end
               def test_update
                 post :update, :id => '3', :issue_status => {:name => 'Renamed status'}
-                assert_redirected_to 'issue_statuses/list'
+                assert_redirected_to :action => 'index'
                 status = IssueStatus.find(3)
                 assert_equal 'Renamed status', status.name
               end
               def test_destroy
                 Issue.delete_all("status_id = 1")
                 assert_difference 'IssueStatus.count', -1 do
                   post :destroy, :id => '1'
                 end
-                assert_redirected_to 'issue_statuses/list'
+                assert_redirected_to :action => 'index'
                 assert_nil IssueStatus.find_by_id(1)
               end
               def test_destroy_should_block_if_status_in_use
                 assert_not_nil Issue.find_by_status_id(1)
                 assert_no_difference 'IssueStatus.count' do
                   post :destroy, :id => '1'
                 end
-                assert_redirected_to 'issue_statuses/list'
+                assert_redirected_to :action => 'index'
                 assert_not_nil IssueStatus.find_by_id(1)
               end
               context "on POST to :update_issue_done_ratio" do
                 context "with Setting.issue_done_ratio using the issue_field" do
                   setup do
                     Setting.issue_done_ratio = 'issue_field'
                     post :update_issue_done_ratio
                   end
                   should_set_the_flash_to /not updated/
-                  should_redirect_to('the list') { '/issue_statuses/list' }
+                  should_redirect_to('the index') { '/issue_statuses' }
                 end
                 context "with Setting.issue_done_ratio using the issue_status" do
                   setup do
                     Setting.issue_done_ratio = 'issue_status'
                     post :update_issue_done_ratio
                   end
                   should_set_the_flash_to /Issue done ratios updated/
-                  should_redirect_to('the list') { '/issue_statuses/list' }
+                  should_redirect_to('the index') { '/issue_statuses' }
                 end
               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