fix a bug where user.ui.lists would not be populated correctly

This commit is contained in:
rolux 2011-09-17 15:06:53 +00:00
parent 285dbde77c
commit f676edb953
3 changed files with 13 additions and 11 deletions

View file

@ -472,15 +472,6 @@
] ]
} }
], ],
"listDefaults": {
"columns": ["title", "director", "country", "year", "language", "runtime", "genre"],
"columnWidth": {},
"listView": "grid",
"selected": [],
"sort": [
{"key": "director", "operator": ""}
]
},
"listViews": [ "listViews": [
{"id": "list", "title": "as List"}, {"id": "list", "title": "as List"},
{"id": "grid", "title": "as Grid"}, {"id": "grid", "title": "as Grid"},
@ -561,7 +552,17 @@
"item": "", "item": "",
"itemView": "info", "itemView": "info",
"list": "", "list": "",
"lists": {}, "lists": {
"": {
"columns": ["title", "director", "country", "year", "language", "runtime", "genre"],
"columnWidth": {},
"listView": "grid",
"selected": [],
"sort": [
{"key": "director", "operator": ""}
]
}
},
"query": {"conditions": [], "operator": ""}, "query": {"conditions": [], "operator": ""},
"section": "items", "section": "items",
"showAnnotations": true, "showAnnotations": true,

View file

@ -51,6 +51,7 @@ Ox.load({
site: data.site, site: data.site,
user: data.user.level == 'guest' ? Ox.extend({}, data.site.user) : data.user user: data.user.level == 'guest' ? Ox.extend({}, data.site.user) : data.user
}); });
Ox.print("USER", data.user)
Ox.extend(pandora.site, { Ox.extend(pandora.site, {
findKeys: Ox.map(data.site.itemKeys, function(key) { findKeys: Ox.map(data.site.itemKeys, function(key) {
return key.find ? key : null; return key.find ? key : null;

View file

@ -227,7 +227,7 @@ pandora.Query = (function() {
Ox.print('STATE', data); Ox.print('STATE', data);
Ox.print(Ox.repeat('-', 120)); Ox.print(Ox.repeat('-', 120));
!pandora.user.ui.lists[data.list] && pandora.UI.set( !pandora.user.ui.lists[data.list] && pandora.UI.set(
'lists|' + data.list, pandora.site.listDefaults 'lists|' + data.list, pandora.site.user.lists['']
); );
pandora.UI.set({list: data.list}); pandora.UI.set({list: data.list});
pandora.user.ui.find = data.find; pandora.user.ui.find = data.find;