From 044e820d57bff64af94ea3778a544f598d106c8f Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 4 Jun 2011 18:42:07 +0200 Subject: [PATCH] private/personal --- pandora/itemlist/models.py | 4 ++-- static/js/pandora/pandora.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pandora/itemlist/models.py b/pandora/itemlist/models.py index 083a5d0..d55c936 100644 --- a/pandora/itemlist/models.py +++ b/pandora/itemlist/models.py @@ -22,8 +22,8 @@ class List(models.Model): modified = models.DateTimeField(auto_now=True) user = models.ForeignKey(User, related_name='lists') name = models.CharField(max_length=255) - status = models.CharField(max_length=20, default='personal') - _status = ['personal', 'public', 'featured'] + status = models.CharField(max_length=20, default='private') + _status = ['private', 'public', 'featured'] query = DictField(default={"static": True}) type= models.CharField(max_length=255, default='static') description = models.TextField(default='') diff --git a/static/js/pandora/pandora.js b/static/js/pandora/pandora.js index b140ae8..d351399 100644 --- a/static/js/pandora/pandora.js +++ b/static/js/pandora/pandora.js @@ -124,13 +124,14 @@ pandora.reloadList = function() { }); app.$ui.list.bindEvent({ init: function(event, data) { - app.$ui.folderList[listData.status] - .value(listData.id, 'items', data.items); + var folder = listData.status == 'private' ? 'personal' : listData.status; + app.$ui.folderList[folder].value(listData.id, 'items', data.items); } }) .bindEventOnce({ load: function(event, data) { - app.$ui.list.gainFocus().options({selected: [data.items]}); + app.$ui.list.gainFocus(); + if (data) app.$ui.list.options({selected: [data.items]}); } }) .reloadList();