diff options
| author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-29 22:08:41 -0400 |
|---|---|---|
| committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-08-29 22:08:41 -0400 |
| commit | 58155288fb27e0486f298b00798a550516d4d0ef (patch) | |
| tree | 122b069c26cb41c4e607b462669033139282d2a9 /client/lib | |
| parent | dd0682328bc26bbe852fb19a85131e4017c547b0 (diff) | |
| parent | d1ab787215adb83064a5be4678e7073ba71fbb22 (diff) | |
| download | wekan-58155288fb27e0486f298b00798a550516d4d0ef.tar.gz wekan-58155288fb27e0486f298b00798a550516d4d0ef.tar.bz2 wekan-58155288fb27e0486f298b00798a550516d4d0ef.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'client/lib')
| -rw-r--r-- | client/lib/filter.js | 4 | ||||
| -rw-r--r-- | client/lib/popup.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/client/lib/filter.js b/client/lib/filter.js index f19dc617..1ca3a280 100644 --- a/client/lib/filter.js +++ b/client/lib/filter.js @@ -451,10 +451,12 @@ Filter = { // before changing the schema. labelIds: new SetFilter(), members: new SetFilter(), + archive: new SetFilter(), + hideEmpty: new SetFilter(), customFields: new SetFilter('_id'), advanced: new AdvancedFilter(), - _fields: ['labelIds', 'members', 'customFields'], + _fields: ['labelIds', 'members', 'archive', 'hideEmpty', 'customFields'], // We don't filter cards that have been added after the last filter change. To // implement this we keep the id of these cards in this `_exceptions` fields diff --git a/client/lib/popup.js b/client/lib/popup.js index 6c294d32..8095fbd2 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -67,7 +67,7 @@ window.Popup = new (class { title: self._getTitle(popupName), depth: self._stack.length, offset: self._getOffset(openerElement), - dataContext: (this.currentData && this.currentData()) || this, + dataContext: (this && this.currentData && this.currentData()) || this, }); // If there are no popup currently opened we use the Blaze API to render |