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

merge

Browse source
This commit is contained in:
j 2011-12-27 12:25:39 +05:30
commit 876e360e76
13 changed files with 68 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/js/pandora/placesDialog.js
View file

@ -30,7 +30,10 @@ pandora.ui.placesDialog = function() {
pandora.api.findClips({
query: {
conditions: names.map(function(name) {
return {key: 'subtitles', value: name, operator: '='};
//FIXME: this should be more generic
return Ox.getObjectById(pandora.site.layers, 'subtitles')
? {key: 'subtitles', value: name, operator: '='}
: {key: 'locations', value: name, operator: '=='};
}),
operator: names.length == 1 ? '&' : '|'
}