This commit is contained in:
rolux 2011-11-04 12:13:45 +00:00
commit 7c9337d6c4
5 changed files with 23 additions and 14 deletions

View file

@ -47,7 +47,7 @@ def log(request):
l.save() l.save()
response = json_response() response = json_response()
return render_to_json_response(response) return render_to_json_response(response)
actions.register(log) actions.register(log, cache=False)
@admin_required_json @admin_required_json

View file

@ -10,6 +10,5 @@ django-celery>2.1.1
#-e git+https://github.com/django-extensions/django-extensions.git#egg=django_extensions #-e git+https://github.com/django-extensions/django-extensions.git#egg=django_extensions
#use fork fixing some postgresql issues #use fork fixing some postgresql issues
-e git://github.com/bit/django-extensions.git#egg=django_extensions -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 -e git+git://github.com/dcramer/django-devserver#egg=django_devserver
gunicorn gunicorn

View file

@ -115,7 +115,6 @@ appPanel
loadingScreen.style.backgroundColor = theme == 'classic' loadingScreen.style.backgroundColor = theme == 'classic'
? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)'; ? 'rgb(224, 224, 224)' : 'rgb(32, 32, 32)';
loadingScreen.style.zIndex = '1001'; loadingScreen.style.zIndex = '1001';
Ox.print(images)
loadingScreen.appendChild(images.logo); loadingScreen.appendChild(images.logo);
loadingScreen.appendChild(images.reflection); loadingScreen.appendChild(images.reflection);
loadingScreen.appendChild(gradient); loadingScreen.appendChild(gradient);
@ -138,7 +137,7 @@ appPanel
theme: theme theme: theme
}, },
Geo: {} Geo: {}
}, callback) }, callback);
} }
function loadPandora(browserSupported) { function loadPandora(browserSupported) {
@ -237,7 +236,6 @@ appPanel
}) : null; }) : null;
}) })
}); });
pandora.site.listSettings = {}; pandora.site.listSettings = {};
Ox.map(pandora.site.user.ui, function(val, key) { Ox.map(pandora.site.user.ui, function(val, key) {
if (/^list[A-Z]/.test(key)) { if (/^list[A-Z]/.test(key)) {

View file

@ -115,6 +115,7 @@ pandora.URL = (function() {
Ox.print('SET STATE:', state) Ox.print('SET STATE:', state)
var find, previousUI = pandora.UI.getPrevious(); 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._groupsState = pandora.getGroupsState(pandora.user.ui.find);
pandora.user.ui._findState = pandora.getFindState(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) { if (pandora.user.ui.showHome) {
pandora.$ui.home = pandora.ui.home().showScreen(); 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 { } else {
/* /*
pandora.UI.set({ pandora.UI.set({

View file

@ -1,18 +1,31 @@
#!/bin/bash #!/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` cd `dirname $0`
base=`pwd` base=`pwd`
current=`bzr revno` current=`bzr revno`
bzr pull http://code.0x2620.org/pandora/ bzr pull $pandora_repos
new=`bzr revno` new=`bzr revno`
cd static/oxjs cd $base
current=$current`bzr revno` if [ -e static/oxjs ]; then
bzr pull http://code.0x2620.org/oxjs/ cd static/oxjs
new=$new`bzr revno` 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 cd $base
if [ -e src/python-ox ]; then if [ -e src/python-ox ]; then
cd src/python-ox cd src/python-ox
current=$current`bzr revno` current=$current`bzr revno`
bzr pull http://code.0x2620.org/python-ox/ bzr pull $python_ox_repos
new=$new`bzr revno` new=$new`bzr revno`
fi fi
cd $base cd $base
@ -20,4 +33,5 @@ if [ $current -ne $new ]; then
cd pandora cd pandora
./manage.py update_static ./manage.py update_static
./manage.py compile_pyc ./manage.py compile_pyc
./manage.py sqldiff -a | grep -v BEGIN | grep -v COMMIT
fi fi