Moved ProjectsController#list to ProjectsController#index.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1464 e93f8b46-1217-0410-a6f0-8f06a7374b81

Moved ProjectsController#list to ProjectsController#index.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1464 e93f8b46-1217-0410-a6f0-8f06a7374b81
744d8669 · Jean-Philippe Lang · aa87a73e · 744d8669 · 744d8669 · 744d8669
Commit 744d8669 authored May 26, 2008 by Jean-Philippe Lang
Showing with 2 additions and 13 deletions

projects_controller.rb app/controllers/projects_controller.rb +1 -6

index.rhtml app/views/projects/index.rhtml +0 -0

projects_controller_test.rb test/functional/projects_controller_test.rb +1 -7

No files found.
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -44,13 +44,8 @@ class ProjectsController < ApplicationController
  include RepositoriesHelper
  include ProjectsHelper
  
-  def index
-    list
-    render :action => 'list' unless request.xhr?
-  end
-
  # Lists visible projects
-  def list
+  def index
    projects = Project.find :all,
                            :conditions => Project.visible_by(User.current),
                            :include => :parent

--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -35,13 +35,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
  def test_index
    get :index
    assert_response :success
-    assert_template 'list'
-  end
-
-  def test_list
-    get :list
-    assert_response :success
-    assert_template 'list'
+    assert_template 'index'
    assert_not_nil assigns(:project_tree)
    # Root project as hash key
    assert assigns(:project_tree).has_key?(Project.find(1))