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

fix a bug that would prevent replacing groups

Browse source
This commit is contained in:
rolux 2011-11-05 18:22:23 +00:00
parent 16adecaccd
commit fa7263fb56
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/js/pandora/group.js
View file

@ -204,7 +204,7 @@ pandora.ui.group = function(id) {
replaceGroup(i, id_); replaceGroup(i, id_);
replaceGroup(i_, id); replaceGroup(i_, id);
} }
pandora.$ui.mainMenu.replaceMenu('sortMenu', pandora.getSortMenu()); //pandora.$ui.mainMenu.replaceMenu('sortMenu', pandora.getSortMenu());
function makeGroup(id, sort) { function makeGroup(id, sort) {
// makes user.ui.groups object from site.groups object // makes user.ui.groups object from site.groups object
var group = Ox.getObjectById(pandora.site.groups, id); var group = Ox.getObjectById(pandora.site.groups, id);

4
static/js/pandora/menu.js
View file

@ -1,5 +1,4 @@
// vim: et:ts=4:sw=4:sts=4:ft=javascript // vim: et:ts=4:sw=4:sts=4:ft=javascript
'use strict';
pandora.ui.mainMenu = function() { pandora.ui.mainMenu = function() {
var isAdmin = pandora.user.level == 'admin', var isAdmin = pandora.user.level == 'admin',
@ -330,6 +329,9 @@ pandora.ui.mainMenu = function() {
that[action]('deletelist'); that[action]('deletelist');
that[ui.listSelection.length ? 'enableItem' : 'disableItem']('newlistfromselection'); that[ui.listSelection.length ? 'enableItem' : 'disableItem']('newlistfromselection');
}, },
pandora_groups: function(data) {
that.replaceMenu('sortMenu', getSortMenu());
},
pandora_item: function(data) { pandora_item: function(data) {
if (!!data.value != !!data.previousValue) { if (!!data.value != !!data.previousValue) {
that[data.value ? 'disableItem' : 'enableItem']('showgroups'); that[data.value ? 'disableItem' : 'enableItem']('showgroups');