From c01cc3b20a636bb540724257ccda671a4ce274f7 Mon Sep 17 00:00:00 2001 From: Anders Thomsen Date: Mon, 19 Nov 2018 22:23:19 +0100 Subject: [PATCH 2/2] Mark current project when filtering project jump box --- app/controllers/projects_controller.rb | 4 ++++ app/helpers/application_helper.rb | 2 +- app/views/projects/autocomplete.js.erb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 25314d831..10bf0f98e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -70,6 +70,10 @@ class ProjectsController < ApplicationController else @projects = User.current.projects.to_a end + + if params[:current_project_id].present? + @selected = Project.find(params[:current_project_id]) + end } end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 52c0df1c2..41d65f515 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -431,7 +431,7 @@ module ApplicationHelper text = @project.name_was end text ||= l(:label_jump_to_a_project) - url = autocomplete_projects_path(:format => 'js', :jump => current_menu_item) + url = autocomplete_projects_path(:format => 'js', :jump => current_menu_item, :current_project_id => @project.try(:id)) trigger = content_tag('span', text, :class => 'drdn-trigger') q = text_field_tag('q', '', :id => 'projects-quick-search', :class => 'autocomplete', :data => {:automcomplete_url => url}, :autocomplete => 'off') diff --git a/app/views/projects/autocomplete.js.erb b/app/views/projects/autocomplete.js.erb index cbfa9c470..66b9d5afd 100644 --- a/app/views/projects/autocomplete.js.erb +++ b/app/views/projects/autocomplete.js.erb @@ -1,7 +1,7 @@ <% s = '' if @projects.any? - s = render_projects_for_jump_box(@projects, params[:q]) + s = render_projects_for_jump_box(@projects, params[:q], @selected) elsif params[:q].present? s = content_tag('span', l(:label_no_data)) end -- 2.19.2