projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12684-pysdk-auto-retry'
[arvados.git]
/
services
/
api
/
app
/
models
/
arvados_model.rb
diff --git
a/services/api/app/models/arvados_model.rb
b/services/api/app/models/arvados_model.rb
index 1ff46c3616975f4d90e23b5ef4603facd1ccc217..d910320ec0f56a6bdbc14572d82249a36039f9bb 100644
(file)
--- a/
services/api/app/models/arvados_model.rb
+++ b/
services/api/app/models/arvados_model.rb
@@
-156,7
+156,7
@@
class ArvadosModel < ApplicationRecord
end
def self.searchable_columns operator
end
def self.searchable_columns operator
- textonly_operator = !operator.match(/[<=>]/)
+ textonly_operator = !operator.match(/[<=>]/)
&& !operator.in?(['in', 'not in'])
self.columns.select do |col|
case col.type
when :string, :text
self.columns.select do |col|
case col.type
when :string, :text
@@
-970,6
+970,7
@@
class ArvadosModel < ApplicationRecord
'max_run_time' => 0,
'partitions' => [],
'preemptible' => false,
'max_run_time' => 0,
'partitions' => [],
'preemptible' => false,
+ 'supervisor' => false,
}.merge(attributes['scheduling_parameters'] || {})
end
}.merge(attributes['scheduling_parameters'] || {})
end