jro_apps/redmine Commit - r15601:124a459d5585

0

app/controllers/account_controller.rb +2 0

               helper :custom_fields
               include CustomFieldsHelper
+              self.main_menu = false
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_action :check_if_login_required, :check_password_change

0

app/controllers/admin_controller.rb +1 0

             class AdminController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               menu_item :projects, :only => :projects
               menu_item :plugins, :only => :plugins
               menu_item :info, :only => :info

0

app/controllers/auth_sources_controller.rb +1 0

             class AuthSourcesController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               menu_item :ldap_authentication
               before_action :require_admin

0

app/controllers/custom_field_enumerations_controller.rb +1 0

             class CustomFieldEnumerationsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin
               before_action :find_custom_field

0

app/controllers/custom_fields_controller.rb +1 0

             class CustomFieldsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin
               before_action :build_new_custom_field, :only => [:new, :create]

0

app/controllers/email_addresses_controller.rb +1 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class EmailAddressesController < ApplicationController
+              self.main_menu = false
               before_action :find_user, :require_admin_or_current_user
               before_action :find_email_address, :only => [:update, :destroy]
               require_sudo_mode :create, :update, :destroy

0

app/controllers/enumerations_controller.rb +1 0

             class EnumerationsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin, :except => :index
               before_action :require_admin_or_api_request, :only => :index

0

app/controllers/groups_controller.rb +1 0

             class GroupsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin
               before_action :find_group, :except => [:index, :new, :create]

0

app/controllers/issue_statuses_controller.rb +1 0

             class IssueStatusesController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin, :except => :index
               before_action :require_admin_or_api_request, :only => :index

0

app/controllers/my_controller.rb +1 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MyController < ApplicationController
+              self.main_menu = false
               before_action :require_login
               # let user change user's password when user has to
               skip_before_action :check_password_change, :only => :password

0

app/controllers/principal_memberships_controller.rb +1 0

             class PrincipalMembershipsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin
               before_action :find_principal, :only => [:new, :create]

0

app/controllers/projects_controller.rb +1 0

             class ProjectsController < ApplicationController
               menu_item :overview
               menu_item :settings, :only => :settings
+              menu_item :projects, :only => [:index, :new,  :create]
               before_action :find_project, :except => [ :index, :list, :new, :create, :copy ]
               before_action :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]

0

app/controllers/roles_controller.rb +1 0

             class RolesController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin, :except => [:index, :show]
               before_action :require_admin_or_api_request, :only => [:index, :show]

0

app/controllers/settings_controller.rb +1 0

             class SettingsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               menu_item :plugins, :only => :plugin
               helper :queries

0

app/controllers/trackers_controller.rb +1 0

             class TrackersController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin, :except => :index
               before_action :require_admin_or_api_request, :only => :index

0

app/controllers/users_controller.rb +1 0

             class UsersController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin, :except => :show
               before_action :find_user, :only => [:show, :edit, :update, :destroy]

0

app/controllers/welcome_controller.rb +1 0

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WelcomeController < ApplicationController
+              self.main_menu = false
               def index
                 @news = News.latest User.current

0

app/controllers/workflows_controller.rb +1 0

             class WorkflowsController < ApplicationController
               layout 'admin'
+              self.main_menu = false
               before_action :require_admin

0

app/helpers/projects_helper.rb +2 -9

               end
               def render_project_action_links
-                links = []
+                links = "".html_safe
                 if User.current.allowed_to?(:add_project, nil, :global => true)
                   links << link_to(l(:label_project_new), new_project_path, :class => 'icon icon-add')
                 end
-                if User.current.allowed_to?(:view_issues, nil, :global => true)
+                links
-                  links << link_to(l(:label_issue_view_all), issues_path)
-                end
-                if User.current.allowed_to?(:view_time_entries, nil, :global => true)
-                  links << link_to(l(:label_overall_spent_time), time_entries_path)
-                end
-                links << link_to(l(:label_overall_activity), activity_path)
-                links.join(" | ").html_safe
               end
               # Renders the projects index

0

lib/redmine.rb +15 -1

@@ -203,7 +203,21 Redmine::MenuManager.map :account_menu do \|menu\|
203	end	203	end
204		204
205	Redmine::MenuManager.map :application_menu do \|menu\|	205	Redmine::MenuManager.map :application_menu do \|menu\|
206	# Empty	206	menu.push :projects, {:controller => 'projects', :action => 'index'},
		207	:permission => nil,
		208	:caption => :label_project_plural
		209	menu.push :activity, {:controller => 'activities', :action => 'index'}
		210	menu.push :issues, {:controller => 'issues', :action => 'index'},
		211	:if => Proc.new {User.current.allowed_to?(:view_issues, nil, :global => true)},
		212	:caption => :label_issue_plural
		213	menu.push :time_entries, {:controller => 'timelog', :action => 'index'},
		214	:if => Proc.new {User.current.allowed_to?(:view_time_entries, nil, :global => true)},
		215	:caption => :label_spent_time
		216	menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :caption => :label_gantt
		217	menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :caption => :label_calendar
		218
		219	menu.push :news, {:controller => 'news', :action => 'index'},
		220	:caption => :label_news_plural
207	end	221	end
208		222
209	Redmine::MenuManager.map :admin_menu do \|menu\|	223	Redmine::MenuManager.map :admin_menu do \|menu\|

0

lib/redmine/menu_manager.rb +16 -3

                 module MenuController
                   def self.included(base)
+                    base.class_attribute :main_menu
+                    base.main_menu = true
                     base.extend(ClassMethods)
                   end
                     self.class.menu_items
                   end
+                  def current_menu(project)
+                    if project && !project.new_record?
+                      :project_menu
+                    elsif self.class.main_menu
+                      :application_menu
+                    end
+                  end
                   # Returns the menu item name according to the current action
                   def current_menu_item
                     @current_menu_item ||= menu_items[controller_name.to_sym][:actions][action_name.to_sym] ||
                   # Renders the application main menu
                   def render_main_menu(project)
-                    render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
+                    if menu_name = controller.current_menu(project)
+                      render_menu(menu_name, project)
+                    end
                   end
                   def display_main_menu?(project)
-                    menu_name = project && !project.new_record? ? :project_menu : :application_menu
+                    menu_name = controller.current_menu(project)
-                    Redmine::MenuManager.items(menu_name).children.present?
+                    menu_name.present? && Redmine::MenuManager.items(menu_name).children.present?
                   end
                   def render_menu(menu, project=nil)

0

test/functional/issues_controller_test.rb +1 -1

                                 :subject => ''}
                 assert_response :success
                 # no project menu
-                assert_select '#main-menu', 0
+                assert_select '#main-menu a.overview', 0
               end
               def test_post_create_should_send_a_notification

0

test/integration/lib/redmine/menu_manager_test.rb +13 0

@@ -63,4 +63,17 class MenuManagerTest < Redmine::IntegrationTest
63	end	63	end
64	end	64	end
65	end	65	end
		66
		67	def test_main_menu_should_select_projects_tab_on_project_list
		68	get '/projects'
		69	assert_select '#main-menu' do
		70	assert_select 'a.projects'
		71	assert_select 'a.projects.selected'
		72	end
		73	end
		74
		75	def test_main_menu_should_not_show_up_on_account
		76	get '/login'
		77	assert_select '#main-menu', 0
		78	end
66	end	79	end

	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