projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2076-check-config-at-boot'
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index 05d12427e6f6729c52dd59316f0c7a86c3cd1fb6..34a22aa809cb8d794056c690ac39eabcf1ad9f8f 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-125,6
+125,7
@@
class ApplicationController < ActionController::Base
@where.each do |attr,value|
if attr == :any
if value.is_a?(Array) and
@where.each do |attr,value|
if attr == :any
if value.is_a?(Array) and
+ value.length == 2 and
value[0] == 'contains' and
model_class.columns.collect(&:name).index('name') then
ilikes = []
value[0] == 'contains' and
model_class.columns.collect(&:name).index('name') then
ilikes = []
@@
-142,8
+143,13
@@
class ApplicationController < ActionController::Base
conditions[0] << " and #{table_name}.#{attr} is ?"
conditions << nil
elsif value.is_a? Array
conditions[0] << " and #{table_name}.#{attr} is ?"
conditions << nil
elsif value.is_a? Array
- conditions[0] << " and #{table_name}.#{attr} in (?)"
- conditions << value
+ if value[0] == 'contains' and value.length == 2
+ conditions[0] << " and #{table_name}.#{attr} like ?"
+ conditions << "%#{value[1]}%"
+ else
+ conditions[0] << " and #{table_name}.#{attr} in (?)"
+ conditions << value
+ end
elsif value.is_a? String or value.is_a? Fixnum or value == true or value == false
conditions[0] << " and #{table_name}.#{attr}=?"
conditions << value
elsif value.is_a? String or value.is_a? Fixnum or value == true or value == false
conditions[0] << " and #{table_name}.#{attr}=?"
conditions << value