From b1c5a76e0d3220143c2730a6a4eba5d2623b1b6b Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 4 Nov 2011 12:24:54 +0100 Subject: [PATCH 1/4] set ui._list not only if showing home screen --- static/js/pandora.js | 4 +--- static/js/pandora/URL.js | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/static/js/pandora.js b/static/js/pandora.js index de98147a7..0808c8137 100644 --- a/static/js/pandora.js +++ b/static/js/pandora.js @@ -115,7 +115,6 @@ appPanel loadingScreen.style.backgroundColor = theme == 'classic' ? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)'; loadingScreen.style.zIndex = '1001'; - Ox.print(images) loadingScreen.appendChild(images.logo); loadingScreen.appendChild(images.reflection); loadingScreen.appendChild(gradient); @@ -138,7 +137,7 @@ appPanel theme: theme }, Geo: {} - }, callback) + }, callback); } function loadPandora(browserSupported) { @@ -237,7 +236,6 @@ appPanel }) : null; }) }); - pandora.site.listSettings = {}; Ox.map(pandora.site.user.ui, function(val, key) { if (/^list[A-Z]/.test(key)) { diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js index 36b177813..4dfcd3a89 100644 --- a/static/js/pandora/URL.js +++ b/static/js/pandora/URL.js @@ -115,6 +115,7 @@ pandora.URL = (function() { Ox.print('SET STATE:', state) var find, previousUI = pandora.UI.getPrevious(); + pandora.user.ui._list = pandora.getListsState(pandora.user.ui.find); pandora.user.ui._groupsState = pandora.getGroupsState(pandora.user.ui.find); pandora.user.ui._findState = pandora.getFindState(pandora.user.ui.find); @@ -122,9 +123,6 @@ pandora.URL = (function() { if (pandora.user.ui.showHome) { pandora.$ui.home = pandora.ui.home().showScreen(); - pandora.user.ui._list = pandora.getListsState(pandora.user.ui.find); - pandora.user.ui._groupsState = pandora.getGroupsState(pandora.user.ui.find); - pandora.user.ui._findState = pandora.getFindState(pandora.user.ui.find); } else { /* pandora.UI.set({ From eb33042d8733c0eb99fa45a9c51dd84cd2872cd4 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 4 Nov 2011 12:25:10 +0100 Subject: [PATCH 2/4] dont cache log calls --- pandora/log/views.py | 2 +- requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora/log/views.py b/pandora/log/views.py index 6e529ec95..70b78d75e 100644 --- a/pandora/log/views.py +++ b/pandora/log/views.py @@ -47,7 +47,7 @@ def log(request): l.save() response = json_response() return render_to_json_response(response) -actions.register(log) +actions.register(log, cache=False) @admin_required_json diff --git a/requirements.txt b/requirements.txt index a083ef367..b37bc72b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,5 @@ django-celery>2.1.1 #-e git+https://github.com/django-extensions/django-extensions.git#egg=django_extensions #use fork fixing some postgresql issues -e git://github.com/bit/django-extensions.git#egg=django_extensions --e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg -e git+git://github.com/dcramer/django-devserver#egg=django_devserver gunicorn From ae6f8df8862a19f858ec53664b2fe9302b49d17d Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 4 Nov 2011 12:29:00 +0100 Subject: [PATCH 3/4] show sqldiff --- update.sh | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/update.sh b/update.sh index 0a1f56e8c..1f53899d4 100755 --- a/update.sh +++ b/update.sh @@ -1,18 +1,31 @@ #!/bin/bash +pandora_repos=http://code.0x2620.org/pandora/ +oxjs_repos=http://code.0x2620.org/oxjs/ +python_ox_repos=http://code.0x2620.org/python-ox/ + cd `dirname $0` base=`pwd` current=`bzr revno` -bzr pull http://code.0x2620.org/pandora/ +bzr pull $pandora_repos new=`bzr revno` -cd static/oxjs -current=$current`bzr revno` -bzr pull http://code.0x2620.org/oxjs/ -new=$new`bzr revno` +cd $base +if [ -e static/oxjs ]; then + cd static/oxjs + current=$current`bzr revno` + bzr pull $oxjs_repos + new=$new`bzr revno` +else + cd static + bzr branch $oxjs_repos + cd oxjs + new=$new`bzr revno` +fi + cd $base if [ -e src/python-ox ]; then cd src/python-ox current=$current`bzr revno` - bzr pull http://code.0x2620.org/python-ox/ + bzr pull $python_ox_repos new=$new`bzr revno` fi cd $base @@ -20,4 +33,5 @@ if [ $current -ne $new ]; then cd pandora ./manage.py update_static ./manage.py compile_pyc + ./manage.py sqldiff -a | grep -v BEGIN | grep -v COMMIT fi From 9530049aad8a2ead8bfd25d2e661cc72fc48b21c Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 4 Nov 2011 12:51:47 +0100 Subject: [PATCH 4/4] return director value --- static/js/pandora/infoView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/pandora/infoView.js b/static/js/pandora/infoView.js index d29775465..dea4d8650 100644 --- a/static/js/pandora/infoView.js +++ b/static/js/pandora/infoView.js @@ -178,7 +178,7 @@ pandora.ui.infoView = function(data) { clickLink: pandora.clickLink, editable: isEditable, format: function(value) { - formatValue(value.split(', '), 'name') + return formatValue(value.split(', '), 'name'); }, placeholder: formatLight('Unknown Director'), tooltip: isEditable ? 'Doubleclick to edit' : '',