projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12483: Merge branch 'master' into 12483-writable-fs
[arvados.git]
/
apps
/
workbench
/
app
/
assets
/
javascripts
/
components
/
search.js
diff --git
a/apps/workbench/app/assets/javascripts/components/search.js
b/apps/workbench/app/assets/javascripts/components/search.js
index c593ee11e8c10c661e4d597cb9fed13eec49a489..2fe73193e7f116fcda6c2831c8c2250c2a266aee 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/components/search.js
+++ b/
apps/workbench/app/assets/javascripts/components/search.js
@@
-127,15
+127,12
@@
window.Search = {
return new MultipageLoader({
sessionKey: key,
loadFunc: function(filters) {
return new MultipageLoader({
sessionKey: key,
loadFunc: function(filters) {
+ // Apply additional type dependant filters
+ filters = filters.concat(obj_type.filters)
var tsquery = to_tsquery(q)
if (tsquery) {
var tsquery = to_tsquery(q)
if (tsquery) {
- filters = filters.slice(0)
filters.push(['any', '@@', tsquery])
}
filters.push(['any', '@@', tsquery])
}
- // Apply additional type dependant filters, if any.
- for (i = 0; i < obj_type.filters.length; i++) {
- filters.push(obj_type.filters[i])
- }
return vnode.state.sessionDB.request(session, obj_type.api_path, {
data: {
filters: JSON.stringify(filters),
return vnode.state.sessionDB.request(session, obj_type.api_path, {
data: {
filters: JSON.stringify(filters),