0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

only show clipLayer clips in clips view

Browse source
This commit is contained in:
j 2024-05-17 14:01:16 +02:00
commit cf0ad718f7
5 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
static/js/clipList.js
View file

@ -76,7 +76,14 @@ pandora.ui.clipList = function(videoRatio) {
var itemsQuery, query;
if (!ui.item) {
itemsQuery = ui.find;
query = {conditions: [], operator: itemsQuery.operator};
query = {
conditions: [{
key: "layer",
operator: "&",
value: pandora.site.clipLayers
}],
operator: itemsQuery.operator
};
// if the item query contains a layer condition,
// then this condition is added to the clip query
addConditions(query, itemsQuery.conditions);
@ -99,13 +106,20 @@ pandora.ui.clipList = function(videoRatio) {
operator: '&'
};
query = {
conditions: ui.itemFind === '' ? [] : [{
key: 'annotations',
value: ui.itemFind,
operator: '='
conditions: [{
key: "layer",
operator: "&",
value: pandora.site.clipLayers
}],
operator: '&'
};
if(ui.itemFind) {
query.conditions.push({
key: 'annotations',
value: ui.itemFind,
operator: '='
})
}
findClips();
}

19
static/js/utils.js
View file

@ -1265,6 +1265,25 @@ pandora.getClipsQuery = function(callback) {
};
addClipsConditions(pandora.user.ui.find.conditions);
clipsQuery.operator = clipsQuery.conditions.length ? '|' : '&';
if (clipsQuery.conditions.length) {
clipsQuery.conditions = [
{
key: "layer",
operator: "&",
value: pandora.site.clipLayers
}, {
conditions: clipsQuery.conditions,
operator: '|'
}
]
clipsQuery.operator = '&'
} else {
clipsQuery.conditions.push({
"key": "layer",
"operator": "&",
"value":pandora.site.clipLayers
})
}
if (callback) {
if (pandora.user.ui._list) {
pandora.api.getList({id: pandora.user.ui._list}, function(result) {