jro_apps/redmine Commit - r4089:98eaff414f12

Merged r4185 from trunk....

Eric Davis -

r4089:98eaff414f12

parent child

Context file:

r4089:98eaff414f12

Collapse all files

app/controllers/projects_controller.rb +2 -2

             # Redmine - project management software
             # 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
             # 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 ProjectsController < ApplicationController
               menu_item :overview
               menu_item :roadmap, :only => :roadmap
               menu_item :settings, :only => :settings
               before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
               before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
               before_filter :authorize_global, :only => [:new, :create]
               before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
               accept_key_auth :index
               after_filter :only => [:create, :edit, :update, :archive, :unarchive, :destroy] do |controller|
                 if controller.request.post?
                   controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
                 end
               end
               # TODO: convert to PUT only
               verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :issues
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               # Lists visible projects
               def index
                 respond_to do |format|
                   format.html {
                     @projects = Project.visible.find(:all, :order => 'lft')
                   }
                   format.xml  {
                     @projects = Project.visible.find(:all, :order => 'lft')
                   }
                   format.atom {
                     projects = Project.visible.find(:all, :order => 'created_on DESC',
                                                           :limit => Setting.feeds_limit.to_i)
                     render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               def new
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
                 @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                 @project.trackers = Tracker.all
                 @project.is_public = Setting.default_projects_public?
                 @project.enabled_module_names = Setting.default_projects_modules
               end
               def create
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
                 @project.enabled_module_names = params[:enabled_modules]
                 if validate_parent_id && @project.save
                   @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                   # Add current user as a project member if he is not admin
                   unless User.current.admin?
                     r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                     m = Member.new(:user => User.current, :roles => [r])
                     @project.members << m
                   end
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'settings', :id => @project
                     }
                     format.xml  { head :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'new' }
                     format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
                   end
                 end
               end
               def copy
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @source_project = Project.find(params[:id])
                 if request.get?
                   @project = Project.copy_from(@source_project)
                   if @project
                     @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                   else
                     redirect_to :controller => 'admin', :action => 'projects'
                   end
                 else
                   Mailer.with_deliveries(params[:notifications] == '1') do
                     @project = Project.new(params[:project])
                     @project.enabled_module_names = params[:enabled_modules]
                     if validate_parent_id && @project.copy(@source_project, :only => params[:only])
                       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                       flash[:notice] = l(:notice_successful_create)
-                      redirect_to :controller => 'admin', :action => 'projects'
+                      redirect_to :controller => 'projects', :action => 'settings'
                     elsif !@project.new_record?
                       # Project was created
                       # But some objects were not copied due to validation failures
                       # (eg. issues from disabled trackers)
                       # TODO: inform about that
-                      redirect_to :controller => 'admin', :action => 'projects'
+                      redirect_to :controller => 'projects', :action => 'settings'
                     end
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Show @project
               def show
                 if params[:jump]
                   # try to redirect to the requested menu item
                   redirect_to_project_menu_item(@project, params[:jump]) && return
                 end
                 @users_by_role = @project.users_by_role
                 @subprojects = @project.children.visible
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                 @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
                 respond_to do |format|
                   format.html
                   format.xml
                 end
               end
               def settings
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               def edit
               end
               def update
                 @project.attributes = params[:project]
                 if validate_parent_id && @project.save
                   @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'settings', :id => @project
                     }
                     format.xml  { head :ok }
                   end
                 else
                   respond_to do |format|
                     format.html {
                       settings
                       render :action => 'settings'
                     }
                     format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 flash[:notice] = l(:notice_successful_update)
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 if request.post?
                   unless @project.archive
                     flash[:error] = l(:error_can_not_archive_project)
                   end
                 end
                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.get?
                   # display confirmation view
                 else
                   if params[:format] == 'xml' || params[:confirm]
                     @project_to_destroy.destroy
                     respond_to do |format|
                       format.html { redirect_to :controller => 'admin', :action => 'projects' }
                       format.xml  { head :ok }
                     end
                   end
                 end
                 # hide project in layout
                 @project = nil
               end
             private
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Validates parent_id param according to user's permissions
               # TODO: move it to Project model in a validation that depends on User.current
               def validate_parent_id
                 return true if User.current.admin?
                 parent_id = params[:project] && params[:project][:parent_id]
                 if parent_id || @project.new_record?
                   parent = parent_id.blank? ? nil : Project.find_by_id(parent_id.to_i)
                   unless @project.allowed_parents.include?(parent)
                     @project.errors.add :parent_id, :invalid
                     return false
                   end
                 end
                 true
               end
             end

test/functional/projects_controller_test.rb +11 0

             # Redmine - project management software
             # Copyright (C) 2006-2008  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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < ActionController::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
                        :attachments, :custom_fields, :custom_values, :time_entries
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = nil
                 Setting.default_language = 'en'
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:projects)
                 assert_tag :ul, :child => {:tag => 'li',
                                            :descendant => {:tag => 'a', :content => 'eCookbook'},
                                            :child => { :tag => 'ul',
                                                        :descendant => { :tag => 'a',
                                                                         :content => 'Child of private child'
                                                                        }
                                                       }
                                            }
                 assert_no_tag :a, :content => /Private child of eCookbook/
               end
               def test_index_atom
                 get :index, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
                 assert_select 'feed>title', :text => 'Redmine: Latest projects'
                 assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
               end
               context "#index" do
                 context "by non-admin user with view_time_entries permission" do
                   setup do
                     @request.session[:user_id] = 3
                   end
                   should "show overall spent time link" do
                     get :index
                     assert_template 'index'
                     assert_tag :a, :attributes => {:href => '/time_entries'}
                   end
                 end
                 context "by non-admin user without view_time_entries permission" do
                   setup do
                     Role.find(2).remove_permission! :view_time_entries
                     Role.non_member.remove_permission! :view_time_entries
                     Role.anonymous.remove_permission! :view_time_entries
                     @request.session[:user_id] = 3
                   end
                   should "not show overall spent time link" do
                     get :index
                     assert_template 'index'
                     assert_no_tag :a, :attributes => {:href => '/time_entries'}
                   end
                 end
               end
               context "#new" do
                 context "by admin user" do
                   setup do
                     @request.session[:user_id] = 1
                   end
                   should "accept get" do
                     get :new
                     assert_response :success
                     assert_template 'new'
                   end
                 end
                 context "by non-admin user with add_project permission" do
                   setup do
                     Role.non_member.add_permission! :add_project
                     @request.session[:user_id] = 9
                   end
                   should "accept get" do
                     get :new
                     assert_response :success
                     assert_template 'new'
                     assert_no_tag :select, :attributes => {:name => 'project[parent_id]'}
                   end
                 end
                 context "by non-admin user with add_subprojects permission" do
                   setup do
                     Role.find(1).remove_permission! :add_project
                     Role.find(1).add_permission! :add_subprojects
                     @request.session[:user_id] = 2
                   end
                   should "accept get" do
                     get :new, :parent_id => 'ecookbook'
                     assert_response :success
                     assert_template 'new'
                     # parent project selected
                     assert_tag :select, :attributes => {:name => 'project[parent_id]'},
                                         :child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}}
                     # no empty value
                     assert_no_tag :select, :attributes => {:name => 'project[parent_id]'},
                                            :child => {:tag => 'option', :attributes => {:value => ''}}
                   end
                 end
               end
               context "POST :create" do
                 context "by admin user" do
                   setup do
                     @request.session[:user_id] = 1
                   end
                   should "create a new project" do
                     post :create, :project => { :name => "blog",
                                              :description => "weblog",
                                              :identifier => "blog",
                                              :is_public => 1,
                                              :custom_field_values => { '3' => 'Beta' }
                                             }
                     assert_redirected_to '/projects/blog/settings'
                     project = Project.find_by_name('blog')
                     assert_kind_of Project, project
                     assert_equal 'weblog', project.description
                     assert_equal true, project.is_public?
                     assert_nil project.parent
                   end
                   should "create a new subproject" do
                     post :create, :project => { :name => "blog",
                                              :description => "weblog",
                                              :identifier => "blog",
                                              :is_public => 1,
                                              :custom_field_values => { '3' => 'Beta' },
                                              :parent_id => 1
                                             }
                     assert_redirected_to '/projects/blog/settings'
                     project = Project.find_by_name('blog')
                     assert_kind_of Project, project
                     assert_equal Project.find(1), project.parent
                   end
                 end
                 context "by non-admin user with add_project permission" do
                   setup do
                     Role.non_member.add_permission! :add_project
                     @request.session[:user_id] = 9
                   end
                   should "accept create a Project" do
                     post :create, :project => { :name => "blog",
                                              :description => "weblog",
                                              :identifier => "blog",
                                              :is_public => 1,
                                              :custom_field_values => { '3' => 'Beta' }
                                             }
                     assert_redirected_to '/projects/blog/settings'
                     project = Project.find_by_name('blog')
                     assert_kind_of Project, project
                     assert_equal 'weblog', project.description
                     assert_equal true, project.is_public?
                     # User should be added as a project member
                     assert User.find(9).member_of?(project)
                     assert_equal 1, project.members.size
                   end
                   should "fail with parent_id" do
                     assert_no_difference 'Project.count' do
                       post :create, :project => { :name => "blog",
                                                :description => "weblog",
                                                :identifier => "blog",
                                                :is_public => 1,
                                                :custom_field_values => { '3' => 'Beta' },
                                                :parent_id => 1
                                               }
                     end
                     assert_response :success
                     project = assigns(:project)
                     assert_kind_of Project, project
                     assert_not_nil project.errors.on(:parent_id)
                   end
                 end
                 context "by non-admin user with add_subprojects permission" do
                   setup do
                     Role.find(1).remove_permission! :add_project
                     Role.find(1).add_permission! :add_subprojects
                     @request.session[:user_id] = 2
                   end
                   should "create a project with a parent_id" do
                     post :create, :project => { :name => "blog",
                                              :description => "weblog",
                                              :identifier => "blog",
                                              :is_public => 1,
                                              :custom_field_values => { '3' => 'Beta' },
                                              :parent_id => 1
                                             }
                     assert_redirected_to '/projects/blog/settings'
                     project = Project.find_by_name('blog')
                   end
                   should "fail without parent_id" do
                     assert_no_difference 'Project.count' do
                       post :create, :project => { :name => "blog",
                                                :description => "weblog",
                                                :identifier => "blog",
                                                :is_public => 1,
                                                :custom_field_values => { '3' => 'Beta' }
                                               }
                     end
                     assert_response :success
                     project = assigns(:project)
                     assert_kind_of Project, project
                     assert_not_nil project.errors.on(:parent_id)
                   end
                   should "fail with unauthorized parent_id" do
                     assert !User.find(2).member_of?(Project.find(6))
                     assert_no_difference 'Project.count' do
                       post :create, :project => { :name => "blog",
                                                :description => "weblog",
                                                :identifier => "blog",
                                                :is_public => 1,
                                                :custom_field_values => { '3' => 'Beta' },
                                                :parent_id => 6
                                               }
                     end
                     assert_response :success
                     project = assigns(:project)
                     assert_kind_of Project, project
                     assert_not_nil project.errors.on(:parent_id)
                   end
                 end
               end
               def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_show_by_identifier
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_show_should_not_fail_when_custom_values_are_nil
                 project = Project.find_by_identifier('ecookbook')
                 project.custom_values.first.update_attribute(:value, nil)
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_private_subprojects_hidden
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :content => /Private child/
               end
               def test_private_subprojects_visible
                 @request.session[:user_id] = 2 # manager who is a member of the private subproject
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :content => /Private child/
               end
               def test_settings
                 @request.session[:user_id] = 2 # manager
                 get :settings, :id => 1
                 assert_response :success
                 assert_template 'settings'
               end
               def test_update
                 @request.session[:user_id] = 2 # manager
                 post :update, :id => 1, :project => {:name => 'Test changed name',
                                                    :issue_custom_field_ids => ['']}
                 assert_redirected_to 'projects/ecookbook/settings'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin
                 get :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
               def test_post_destroy
                 @request.session[:user_id] = 1 # admin
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to 'admin/projects'
                 assert_nil Project.find_by_id(1)
               end
               def test_archive
                 @request.session[:user_id] = 1 # admin
                 post :archive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert !Project.find(1).active?
               end
               def test_unarchive
                 @request.session[:user_id] = 1 # admin
                 Project.find(1).archive
                 post :unarchive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert Project.find(1).active?
               end
               def test_project_breadcrumbs_should_be_limited_to_3_ancestors
                 CustomField.delete_all
                 parent = nil
 .times do |i|
                   p = Project.create!(:name => "Breadcrumbs #{i}", :identifier => "breadcrumbs-#{i}")
                   p.set_parent!(parent)
                   get :show, :id => p
                   assert_tag :h1, :parent => { :attributes => {:id => 'header'}},
                                   :children => { :count => [i, 3].min,
                                                  :only => { :tag => 'a' } }
                   parent = p
                 end
               end
               def test_copy_with_project
                 @request.session[:user_id] = 1 # admin
                 get :copy, :id => 1
                 assert_response :success
                 assert_template 'copy'
                 assert assigns(:project)
                 assert_equal Project.find(1).description, assigns(:project).description
                 assert_nil assigns(:project).id
               end
               def test_copy_without_project
                 @request.session[:user_id] = 1 # admin
                 get :copy
                 assert_response :redirect
                 assert_redirected_to :controller => 'admin', :action => 'projects'
               end
+              context "POST :copy" do
+                should "TODO: test the rest of the method"
+                should "redirect to the project settings when successful" do
+                  @request.session[:user_id] = 1 # admin
+                  post :copy, :id => 1, :project => {:name => 'Copy', :identifier => 'unique-copy'}
+                  assert_response :redirect
+                  assert_redirected_to :controller => 'projects', :action => 'settings'
+                end
+              end
               def test_jump_should_redirect_to_active_tab
                 get :show, :id => 1, :jump => 'issues'
                 assert_redirected_to 'projects/ecookbook/issues'
               end
               def test_jump_should_not_redirect_to_inactive_tab
                 get :show, :id => 3, :jump => 'documents'
                 assert_response :success
                 assert_template 'show'
               end
               def test_jump_should_not_redirect_to_unknown_tab
                 get :show, :id => 3, :jump => 'foobar'
                 assert_response :success
                 assert_template 'show'
               end
               # A hook that is manually registered later
               class ProjectBasedTemplate < Redmine::Hook::ViewListener
                 def view_layouts_base_html_head(context)
                   # Adds a project stylesheet
                   stylesheet_link_tag(context[:project].identifier) if context[:project]
                 end
               end
               # Don't use this hook now
               Redmine::Hook.clear_listeners
               def test_hook_response
                 Redmine::Hook.add_listener(ProjectBasedTemplate)
                 get :show, :id => 1
                 assert_tag :tag => 'link', :attributes => {:href => '/stylesheets/ecookbook.css'},
                                            :parent => {:tag => 'head'}
                 Redmine::Hook.clear_listeners
               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