Code cleanup.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10903 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-12-01 17:57:30 +00:00
parent 16441b4938
commit 88d5663ad2
2 changed files with 9 additions and 6 deletions

View File

@ -116,11 +116,7 @@ class ProjectsController < ApplicationController
@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
@project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
else
Mailer.with_deliveries(params[:notifications] == '1') do
@project = Project.new
@ -139,7 +135,8 @@ class ProjectsController < ApplicationController
end
end
rescue ActiveRecord::RecordNotFound
redirect_to :controller => 'admin', :action => 'projects'
# source_project not found
render_404
end
# Show @project

View File

@ -523,6 +523,12 @@ class ProjectsControllerTest < ActionController::TestCase
:attributes => {:name => 'project[enabled_module_names][]', :value => 'issue_tracking'}
end
def test_get_copy_with_invalid_source_should_respond_with_404
@request.session[:user_id] = 1
get :copy, :id => 99
assert_response 404
end
def test_post_copy_should_copy_requested_items
@request.session[:user_id] = 1 # admin
CustomField.delete_all