From 7fa2a8a33803ec632d1471933a5cf2c65291b5ba Mon Sep 17 00:00:00 2001 From: j Date: Fri, 17 Jan 2020 23:34:07 +0100 Subject: [PATCH] fix save as collection in documents section --- static/js/documentFilterForm.js | 1 + static/js/filterDialog.js | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/static/js/documentFilterForm.js b/static/js/documentFilterForm.js index 957bb512..a1fb25c9 100644 --- a/static/js/documentFilterForm.js +++ b/static/js/documentFilterForm.js @@ -37,6 +37,7 @@ pandora.ui.documentFilterForm = function(options) { return item.id; }) }]), + listName: Ox._('Collection'), list: mode == 'find' ? { sort: pandora.user.ui.collectionSort, view: pandora.user.ui.collectionView diff --git a/static/js/filterDialog.js b/static/js/filterDialog.js index 3e5b7b46..6ad2efed 100644 --- a/static/js/filterDialog.js +++ b/static/js/filterDialog.js @@ -12,7 +12,9 @@ pandora.ui.filterDialog = function() { click: function() { var list = pandora.$ui.filterForm.getList(); if (list.save) { - pandora.api.addList({ + pandora.api[ + pandora.user.ui.section == 'documents' ? 'addCollection' : 'addList' + ]({ name: list.name, query: list.query, status: 'private', @@ -20,12 +22,21 @@ pandora.ui.filterDialog = function() { }, function(result) { var $list = pandora.$ui.folderList.personal, id = result.data.id; - pandora.UI.set({ - find: { - conditions: [{key: 'list', value: id, operator: '=='}], - operator: '&' - } - }); + if (pandora.user.ui.section) { + pandora.UI.set({ + findDocuments: { + conditions: [{key: 'collection', value: id, operator: '=='}], + operator: '&' + } + }); + } else { + pandora.UI.set({ + find: { + conditions: [{key: 'list', value: id, operator: '=='}], + operator: '&' + } + }); + } Ox.Request.clearCache(); // fixme: remove $list.bindEventOnce({ load: function(data) {