decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

edit smart edit query

Browse source
This commit is contained in:
j 2014-02-06 10:52:10 +00:00
commit a755177763
2 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
static/js/listDialog.js
View file

@ -140,8 +140,10 @@ pandora.ui.listDialog = function(section) {
}
});
$($updateCheckbox.find('.OxButton')[0]).css({margin: 0});
$($dialog.$element.find('.OxBar')[2]).append($updateCheckbox);
if (pandora.user.ui.section == 'items') {
$($updateCheckbox.find('.OxButton')[0]).css({margin: 0});
$($dialog.$element.find('.OxBar')[2]).append($updateCheckbox);
}
function getWidth(section) {
return section == 'general' ? 496
@ -440,9 +442,12 @@ pandora.ui.listIconPanel = function(listData) {
};
},
items: function(data, callback) {
var listData = pandora.getListData();
pandora.api.find(Ox.extend(data, {
query: {
conditions: ui.section == 'items' ? [{key: 'list', value: listData.id, operator: '=='}] : [],
conditions: ui.section == 'items'
? [{key: 'list', value: listData.id, operator: '=='}]
: listData.query ? listData.query.conditions : [],
operator: '&'
}
}), callback);