Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-13 10:13:04 +02:00
Code Issues Packages Projects Releases Activity

Merged r19325 from trunk to 4.1-stable (#31355, #32503).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19326 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-12-02 02:21:06 +00:00
parent 9bf69021e2
commit e9764d2d18
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/helpers/application_helper.rb
View File

@@ -472,8 +472,9 @@ module ApplicationHelper
def render_projects_for_jump_box(projects, selected=nil)
jump_box = Redmine::ProjectJumpBox.new User.current
bookmarked = jump_box.bookmarked_projects(params[:q])
recents = jump_box.recently_used_projects(params[:q])
query = params[:q] if request.format.js?
bookmarked = jump_box.bookmarked_projects(query)
recents = jump_box.recently_used_projects(query)
projects = projects - (recents + bookmarked)
projects_label = (bookmarked.any? || recents.any?) ? :label_optgroup_others : :label_project_plural
jump = params[:jump].presence || current_menu_item