forked from 0x2620/pandora
merge
This commit is contained in:
commit
b9c6bfe196
3 changed files with 7 additions and 2 deletions
|
@ -38,7 +38,7 @@ def _order_query(qs, sort, prefix='sort__'):
|
|||
sort.append({'operator': '+', 'key': 'director'})
|
||||
elif sort[0]['key'] == 'director':
|
||||
sort.append({'operator': '-', 'key': 'year'})
|
||||
sort.append({'operator': '+', 'key': 'title'})
|
||||
sort.append({'operator': '-', 'key': 'title'})
|
||||
elif sort[0]['key'] == 'year':
|
||||
sort.append({'operator': '+', 'key': 'director'})
|
||||
sort.append({'operator': '+', 'key': 'title'})
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
// vim: et:ts=4:sw=4:sts=4:ft=javascript
|
||||
|
||||
pandora.ui.logsDialog = function() {
|
||||
Ox.Request.clearCache('findLogs');
|
||||
var height = Math.round((window.innerHeight - 48) * 0.9),
|
||||
width = Math.round(window.innerWidth * 0.9),
|
||||
numberOfLogs = 0,
|
||||
|
@ -149,6 +148,7 @@ pandora.ui.logsDialog = function() {
|
|||
width: 48
|
||||
}).bindEvent({
|
||||
click: function() {
|
||||
Ox.Request.clearCache('findLogs');
|
||||
that.close();
|
||||
}
|
||||
})
|
||||
|
|
|
@ -139,6 +139,7 @@ pandora.ui.mainMenu = function() {
|
|||
pandora.site.capabilities.canSeeDebugMenu[pandora.user.level]
|
||||
? [
|
||||
{ id: 'debugMenu', title: 'Debug', items: [
|
||||
{ id: 'logs', title: 'View Logs...'},
|
||||
{ id: 'clearcache', title: 'Clear Cache'},
|
||||
{ id: 'reloadapplication', title: 'Reload Application'},
|
||||
{ id: 'resetui', title: 'Reset UI Settings'},
|
||||
|
@ -266,6 +267,10 @@ pandora.ui.mainMenu = function() {
|
|||
pandora.api.resetUI({}, function() {
|
||||
pandora.$ui.appPanel.reload();
|
||||
});
|
||||
} else if (data.id == 'logs') {
|
||||
(pandora.$ui.logsDialog || (
|
||||
pandora.$ui.logsDialog = pandora.ui.logsDialog())
|
||||
).open();
|
||||
} else if (data.id == 'debug') {
|
||||
if(localStorage.debug) {
|
||||
delete localStorage.debug;
|
||||
|
|
Loading…
Reference in a new issue