Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added permission related search for tickets.

Browse source
This commit is contained in:
Martin Edenhofer 2015-08-05 13:58:53 +02:00
parent f57e8a5ca7
commit 3f6cb885b2
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/controllers/search_controller.rb
View file

@ -20,6 +20,7 @@ class SearchController < ApplicationController
# convert objects string into array of class names # convert objects string into array of class names
# e.g. user-ticket-another_object = %w( User Ticket AnotherObject ) # e.g. user-ticket-another_object = %w( User Ticket AnotherObject )
objects = params[:objects].split('-').map(&:camelize) objects = params[:objects].split('-').map(&:camelize)
search_tickets = objects.delete('Ticket')
# try search index backend # try search index backend
assets = {} assets = {}
@ -32,7 +33,25 @@ class SearchController < ApplicationController
assets = record.assets(assets) assets = record.assets(assets)
result.push item result.push item
} }
# do ticket query by Ticket class to handle ticket permissions
if search_tickets
tickets = Ticket.search(
query: query,
limit: limit,
current_user: current_user,
)
tickets.each do |ticket|
assets = ticket.assets(assets)
item = {
id: ticket.id,
type: 'Ticket',
}
result.push item
end
end
else else
# do query # do query
objects.each { |object| objects.each { |object|
@ -62,13 +81,18 @@ class SearchController < ApplicationController
# GET /api/v1/search # GET /api/v1/search
def search def search
# get params
query = params[:term]
limit = params[:limit] || 10
assets = {} assets = {}
result = [] result = []
objects = %w( Ticket User Organization ) search_index_objects = %w( User Organization )
if SearchIndexBackend.enabled? if SearchIndexBackend.enabled?
# to query search index backend (excluse tickets here, see below)
found_objects = {} found_objects = {}
items = SearchIndexBackend.search( params[:term], params[:limit], objects ) items = SearchIndexBackend.search( query, limit, search_index_objects )
items.each { |item| items.each { |item|
require item[:type].to_filename require item[:type].to_filename
record = Kernel.const_get( item[:type] ).find( item[:id] ) record = Kernel.const_get( item[:type] ).find( item[:id] )
@ -78,6 +102,18 @@ class SearchController < ApplicationController
found_objects[ item[:type] ].push item[:id] found_objects[ item[:type] ].push item[:id]
} }
# do ticket query by Ticket class to handle ticket permissions
tickets = Ticket.search(
query: query,
limit: limit,
current_user: current_user,
)
tickets.each do |ticket|
found_objects[ 'Ticket' ] ||= []
found_objects[ 'Ticket' ].push ticket.id
end
# generate whole result
found_objects.each { |object, object_ids| found_objects.each { |object, object_ids|
data = { data = {
@ -91,8 +127,8 @@ class SearchController < ApplicationController
objects.each { |object| objects.each { |object|
found_objects = object.constantize.search( found_objects = object.constantize.search(
query: params[:term], query: query,
limit: params[:limit], limit: limit,
current_user: current_user, current_user: current_user,
) )