jro_apps/redmine Commit - r14962:dcc569fa34f7

Removed the "New issue" menu item (#6204)....

Jean-Philippe Lang -

r14962:dcc569fa34f7

parent child

Context file:

r14962:dcc569fa34f7

Collapse all files

app/controllers/issues_controller.rb 0 -1

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssuesController < ApplicationController
-              menu_item :new_issue, :only => [:new, :create]
               default_search_scope :issues
               before_filter :find_issue, :only => [:show, :edit, :update]

app/views/issues/index.html.erb +11 -5

             <div class="contextual">
-            <% if !@query.new_record? && @query.editable_by?(User.current) %>
+              <% if @project && User.current.allowed_to?(:add_issues, @project) && @project.trackers.any? %>
-              <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+                <%= link_to l(:label_issue_new), new_project_issue_path(@project), :class => 'icon icon-add new-issue' %>
-              <%= delete_link query_path(@query) %>
+              <% end %>
-            <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
                 <p class="buttons">
                 <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
                 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
-                <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
+                <% if @query.new_record? %>
+                  <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
                     <%= link_to_function l(:button_save),
                                          "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
                                          :class => 'icon icon-save' %>
+                  <% end %>
+                <% else %>
+                  <% if @query.editable_by?(User.current) %>
+                    <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+                    <%= delete_link query_path(@query) %>
+                  <% end %>
                 <% end %>
                 </p>
               </div>

lib/redmine.rb 0 -4

               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', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
-                          :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) },
-                          :if => Proc.new { |p| p.trackers.any? },
-                          :permission => :add_issues
               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
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural

test/functional/issues_controller_test.rb +24 -3

@@ -1057,6 +1057,30 class IssuesControllerTest < ActionController::TestCase
1057	assert @response.body.blank?	1057	assert @response.body.blank?
1058	end	1058	end
1059		1059
		1060	def test_index_should_include_new_issue_link
		1061	@request.session[:user_id] = 2
		1062	get :index, :project_id => 1
		1063	assert_select 'a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
		1064	end
		1065
		1066	def test_index_should_not_include_new_issue_link_for_project_without_trackers
		1067	Project.find(1).trackers.clear
		1068
		1069	@request.session[:user_id] = 2
		1070	get :index, :project_id => 1
		1071	assert_select 'a.new-issue', 0
		1072	end
		1073
		1074	def test_index_should_not_include_new_issue_link_for_users_with_copy_issues_permission_only
		1075	role = Role.find(1)
		1076	role.remove_permission! :add_issues
		1077	role.add_permission! :copy_issues
		1078
		1079	@request.session[:user_id] = 2
		1080	get :index, :project_id => 1
		1081	assert_select 'a.new-issue', 0
		1082	end
		1083
1060	def test_show_by_anonymous	1084	def test_show_by_anonymous
1061	get :show, :id => 1	1085	get :show, :id => 1
1062	assert_response :success	1086	assert_response :success
@@ -2795,9 +2819,6 class IssuesControllerTest < ActionController::TestCase
2795	end	2819	end
2796	assert_select 'input[name=copy_from][value="1"]'	2820	assert_select 'input[name=copy_from][value="1"]'
2797	end	2821	end
2798
2799	# "New issue" menu item should not link to copy
2800	assert_select '#main-menu a.new-issue[href="/projects/ecookbook/issues/new"]'
2801	end	2822	end
2802		2823
2803	def test_new_as_copy_without_add_issues_permission_should_not_propose_current_project_as_target	2824	def test_new_as_copy_without_add_issues_permission_should_not_propose_current_project_as_target

test/functional/projects_controller_test.rb 0 -24

@@ -691,28 +691,4 class ProjectsControllerTest < ActionController::TestCase
691	get :show, :id => 1	691	get :show, :id => 1
692	assert_select 'body.project-ecookbook'	692	assert_select 'body.project-ecookbook'
693	end	693	end
694
695	def test_project_menu_should_include_new_issue_link
696	@request.session[:user_id] = 2
697	get :show, :id => 1
698	assert_select '#main-menu a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
699	end
700
701	def test_project_menu_should_not_include_new_issue_link_for_project_without_trackers
702	Project.find(1).trackers.clear
703
704	@request.session[:user_id] = 2
705	get :show, :id => 1
706	assert_select '#main-menu a.new-issue', 0
707	end
708
709	def test_project_menu_should_not_include_new_issue_link_for_users_with_copy_issues_permission_only
710	role = Role.find(1)
711	role.remove_permission! :add_issues
712	role.add_permission! :copy_issues
713
714	@request.session[:user_id] = 2
715	get :show, :id => 1
716	assert_select '#main-menu a.new-issue', 0
717	end
718	end	694	end

test/unit/lib/redmine_test.rb +1 -7

               end
               def test_project_menu
-                assert_number_of_items_in_menu :project_menu, 14
+                assert_number_of_items_in_menu :project_menu, 13
                 assert_menu_contains_item_named :project_menu, :overview
                 assert_menu_contains_item_named :project_menu, :activity
                 assert_menu_contains_item_named :project_menu, :roadmap
                 assert_menu_contains_item_named :project_menu, :issues
-                assert_menu_contains_item_named :project_menu, :new_issue
                 assert_menu_contains_item_named :project_menu, :calendar
                 assert_menu_contains_item_named :project_menu, :gantt
                 assert_menu_contains_item_named :project_menu, :news
                 assert_menu_contains_item_named :project_menu, :repository
                 assert_menu_contains_item_named :project_menu, :settings
               end
-              def test_new_issue_should_have_root_as_a_parent
-                new_issue = get_menu_item(:project_menu, :new_issue)
-                assert_equal :root, new_issue.parent.name
-              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