<%= option.name %>
+ <% end %>
<% end %>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco b/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
index efa165875..fff57ff2b 100644
--- a/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/inputs.jst.eco
@@ -66,6 +66,10 @@
+
Checkbox
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ca08f0c53..b68c7c063 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -155,7 +155,7 @@ function clone(item, full) {
function clone2(item) {
if (!item) { return item; } // null, undefined values check
- var types = [ Number, String, Boolean ],
+ var types = [ Number, String, Boolean ],
result;
// normalizing primitives if someone did new String('aaa'), or new Number('444');
@@ -168,13 +168,13 @@ function clone2(item) {
if (typeof result == "undefined") {
if (Object.prototype.toString.call( item ) === "[object Array]") {
result = [];
- item.forEach(function(child, index, array) {
+ item.forEach(function(child, index, array) {
result[index] = clone( child );
});
} else if (typeof item == "object") {
// testing that this is DOM
if (item.nodeType && typeof item.cloneNode == "function") {
- var result = item.cloneNode( true );
+ var result = item.cloneNode( true );
} else if (!item.prototype) { // check that this is a literal
if (item instanceof Date) {
result = new Date(item);
@@ -203,6 +203,11 @@ function clone2(item) {
return result;
}
+// taken from https://github.com/epeli/underscore.string/blob/master/underscored.js
+function underscored (str) {
+ return str.trim().replace(/([a-z\d])([A-Z]+)/g, '$1_$2').replace(/[-\s]+/g, '_').toLowerCase();
+}
+
jQuery.event.special.remove = {
remove: function(e) {
if (e.handler) e.handler();
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 3d2e79fc1..f3562aeab 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -3,8 +3,9 @@
class SearchController < ApplicationController
before_action :authentication_check
- # GET /api/v1/search_user_org
- def search_user_org
+ # GET|POST /api/v1/search/:objects
+
+ def search_generic
# enable search only for agents and admins
if !current_user.role?(Z_ROLENAME_AGENT) && !current_user.role?(Z_ROLENAME_ADMIN)
@@ -16,11 +17,15 @@ class SearchController < ApplicationController
query = params[:query]
limit = params[:limit] || 10
+ # convert objects string into array of class names
+ # e.g. user-ticket-another_object = %w( User Ticket AnotherObject )
+ objects = params[:objects].split('-').map(&:camelize)
+
# try search index backend
assets = {}
result = []
if SearchIndexBackend.enabled?
- items = SearchIndexBackend.search( query, limit, %w(User Organization) )
+ items = SearchIndexBackend.search( query, limit, objects )
items.each { |item|
require item[:type].to_filename
record = Kernel.const_get( item[:type] ).find( item[:id] )
@@ -29,34 +34,23 @@ class SearchController < ApplicationController
}
else
# do query
- users = User.search(
- query: query,
- limit: limit,
- current_user: current_user,
- )
- users.each do |user|
- item = {
- id: user.id,
- type: user.class.to_s
- }
- result.push item
- assets = user.assets(assets)
- end
+ objects.each { |object|
- organizations = Organization.search(
- query: query,
- limit: limit,
- current_user: current_user,
- )
+ found_objects = object.constantize.search(
+ query: query,
+ limit: limit,
+ current_user: current_user,
+ )
- organizations.each do |organization|
- item = {
- id: organization.id,
- type: organization.class.to_s
- }
- result.push item
- assets = organization.assets(assets)
- end
+ found_objects.each do |found_object|
+ item = {
+ id: found_object.id,
+ type: found_object.class.to_s
+ }
+ result.push item
+ assets = found_object.assets(assets)
+ end
+ }
end
render json: {
@@ -68,64 +62,54 @@ class SearchController < ApplicationController
# GET /api/v1/search
def search
- # build result list
- tickets = Ticket.search(
- limit: params[:limit],
- query: params[:term],
- current_user: current_user,
- )
- assets = {}
- ticket_result = []
- tickets.each do |ticket|
- assets = ticket.assets(assets)
- ticket_result.push ticket.id
- end
+ assets = {}
+ result = []
+ objects = %w( Ticket User Organization )
+ if SearchIndexBackend.enabled?
- # do query
- users = User.search(
- query: params[:term],
- limit: params[:limit],
- current_user: current_user,
- )
- user_result = []
- users.each do |user|
- user_result.push user.id
- assets = user.assets(assets)
- end
+ found_objects = {}
+ items = SearchIndexBackend.search( params[:term], params[:limit], objects )
+ items.each { |item|
+ require item[:type].to_filename
+ record = Kernel.const_get( item[:type] ).find( item[:id] )
+ assets = record.assets(assets)
- organizations = Organization.search(
- query: params[:term],
- limit: params[:limit],
- current_user: current_user,
- )
-
- organization_result = []
- organizations.each do |organization|
- organization_result.push organization.id
- assets = organization.assets(assets)
- end
-
- result = []
- if ticket_result[0]
- data = {
- name: 'Ticket',
- ids: ticket_result,
+ found_objects[ item[:type] ] ||= []
+ found_objects[ item[:type] ].push item[:id]
}
- result.push data
- end
- if user_result[0]
- data = {
- name: 'User',
- ids: user_result,
+
+ found_objects.each { |object, object_ids|
+
+ data = {
+ name: object,
+ ids: object_ids,
+ }
+ result.push data
}
- result.push data
- end
- if organization_result[0]
- data = {
- name: 'Organization',
- ids: organization_result,
+ else
+
+ objects.each { |object|
+
+ found_objects = object.constantize.search(
+ query: params[:term],
+ limit: params[:limit],
+ current_user: current_user,
+ )
+
+ object_ids = []
+ found_objects.each do |found_object|
+ object_ids.push found_object.id
+ assets = found_object.assets(assets)
+ end
+
+ next if object_ids.empty?
+
+ data = {
+ name: object,
+ ids: object_ids,
+ }
+ result.push data
}
- result.push data
end
# return result
diff --git a/config/routes/search.rb b/config/routes/search.rb
index 827cd97db..44eed8c42 100644
--- a/config/routes/search.rb
+++ b/config/routes/search.rb
@@ -2,9 +2,8 @@ Zammad::Application.routes.draw do
api_path = Rails.configuration.api_path
# search
- match api_path + '/search', to: 'search#search', via: [:get, :post]
-
- # search_user_org
- match api_path + '/search_user_org', to: 'search#search_user_org', via: [:get, :post]
+ match api_path + '/search', to: 'search#search', via: [:get, :post]
+ # search_generic
+ match api_path + '/search/:objects', to: 'search#search_generic', via: [:get, :post]
end