Merged r11064 from trunk (#12652).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11143 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 3901b8e5dc8428249a1a270d31321f307c851fba..1d4f91df03db8dbc5832fa3c2d252dd33d7c15cf 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -198,7 +198,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
               :if => Proc.new { |p| p.shared_versions.any? }
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
-  menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
+  menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
   menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
   menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 2479b3550263708e5f6e25f13a2813426794068f..12cc9174696db7583c589a48984d4cf1f36276fa 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2356,6 +2356,9 @@ class IssuesControllerTest < ActionController::TestCase
     assert_tag 'select', :attributes => {:name => 'issue[project_id]'},
       :child => {:tag => 'option', :attributes => {:value => '2', :selected => nil}, :content => 'OnlineStore'}
     assert_tag 'input', :attributes => {:name => 'copy_from', :value => '1'}
+
+    # "New issue" menu item should not link to copy
+    assert_select '#main-menu a.new-issue[href=/projects/ecookbook/issues/new]'
   end
 
   def test_new_as_copy_with_attachments_should_show_copy_attachments_checkbox