meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Preserve jump param when searching for projects.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16551 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-05-13 09:23:44 +00:00
parent 23dc616850
commit 8dad27236b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/application_helper.rb
View File

@ -356,11 +356,12 @@ module ApplicationHelper
end end
def render_projects_for_jump_box(projects, selected=nil) def render_projects_for_jump_box(projects, selected=nil)
jump = params[:jump].presence || current_menu_item
s = ''.html_safe s = ''.html_safe
project_tree(projects) do |project, level| project_tree(projects) do |project, level|
padding = level * 16 padding = level * 16
text = content_tag('span', project.name, :style => "padding-left:#{padding}px;") text = content_tag('span', project.name, :style => "padding-left:#{padding}px;")
s << link_to(text, project_path(project, :jump => current_menu_item), :title => project.name, :class => (project == selected ? 'selected' : nil)) s << link_to(text, project_path(project, :jump => jump), :title => project.name, :class => (project == selected ? 'selected' : nil))
end end
s s
end end
@ -369,8 +370,10 @@ module ApplicationHelper
def render_project_jump_box def render_project_jump_box
projects = projects_for_jump_box(User.current) projects = projects_for_jump_box(User.current)
text = @project.try(:name) || l(:label_jump_to_a_project) text = @project.try(:name) || l(:label_jump_to_a_project)
url = autocomplete_projects_path(:format => 'js', :jump => current_menu_item)
trigger = content_tag('span', text, :class => 'drdn-trigger') trigger = content_tag('span', text, :class => 'drdn-trigger')
q = text_field_tag('q', '', :id => 'projects-quick-search', :class => 'autocomplete', :data => {:automcomplete_url => autocomplete_projects_path(:format => 'js')}, :autocomplete => 'off') q = text_field_tag('q', '', :id => 'projects-quick-search', :class => 'autocomplete', :data => {:automcomplete_url => url}, :autocomplete => 'off')
all = link_to(l(:label_project_all), projects_path(:jump => current_menu_item), :class => (@project.nil? && controller.class.main_menu ? 'selected' : nil)) all = link_to(l(:label_project_all), projects_path(:jump => current_menu_item), :class => (@project.nil? && controller.class.main_menu ? 'selected' : nil))
content = content_tag('div', content = content_tag('div',
content_tag('div', q, :class => 'quick-search') + content_tag('div', q, :class => 'quick-search') +