Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions app/controllers/autocomplete_controller.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
class AutocompleteController < ApplicationController
def autocomplete()
data = []
data = data + users_search(params[:term])
data = data + projects_search(params[:term])
data = data + users_search(params)
if !params.key?(:identifier)
data = data + projects_search(params[:term])
end
data = data + dates_search(params[:term])

respond_to do |format|
Expand All @@ -12,9 +14,19 @@ def autocomplete()
end
end

def users_search(search)
def users_search(params)
search = params[:term]
data = []
project_id = 3
users = User.where("login LIKE :search OR firstname LIKE :search OR lastname LIKE :search OR CONCAT(firstname, ' ', lastname ) LIKE :search", {search: "%#{search}%"})
if params.key?(:identifier)
project = Project.find_by(identifier: params[:identifier])
if project
project_id = project.id
# Filter by only project members.
users = users.joins("INNER JOIN members on members.user_id = users.id").where("members.project_id = :project_id", {project_id: project_id})
end
end
users.each do |user|
data << {
id: "user_id/=/#{user.id}",
Expand Down
12 changes: 11 additions & 1 deletion assets/javascripts/redmine-timesheet-filter-autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,22 @@ $(document).ready(function() {
$autocompleteFilter.append($('<td class="value"></td>'));
$autocompleteFilter.children('.value').append($autocompleteInput);
$('#filters-table tbody').prepend($autocompleteFilter);

// Autocomplete source.
var source = '/timesheet/filter/autocomplete';
const regex = /^\/projects\/(.+)\//;
var matches;
if ((matches = regex.exec(window.location.pathname)) !== null) {
if (matches[1]) {
source = '/timesheet/filter/' + matches[1] + '/autocomplete';
}
}

$autocompleteInput.autocomplete({
autoFocus: true,
delay: 300,
minLength: 2,
source: "/timesheet/filter/autocomplete",
source: source,
select: function(event, ui) {
var id = ui.item.id;
var parts = id.split('/');
Expand Down
4 changes: 3 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Plugin's routes
# See: http://guides.rubyonrails.org/routing.html

get 'timesheet/filter/autocomplete', :to => 'autocomplete#autocomplete'
get 'timesheet/filter/autocomplete', :to => 'autocomplete#autocomplete'

get 'timesheet/filter/:identifier/autocomplete', :to => 'autocomplete#autocomplete'