diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-12-02 02:21:06 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-12-02 02:21:06 +0000 |
| commit | e9764d2d18821ff1fce80279c24c5690b651e3fd (patch) | |
| tree | 50b226307c401c11cc25ca9cda8c8d9af9ef6aea /app | |
| parent | 9bf69021e2518465cf1776f4dc06ffe6be97b55d (diff) | |
| download | redmine-e9764d2d18821ff1fce80279c24c5690b651e3fd.tar.gz redmine-e9764d2d18821ff1fce80279c24c5690b651e3fd.zip | |
Merged r19325 from trunk to 4.1-stable (#31355, #32503).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19326 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 952c2e58a..e13825082 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 |