decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

update vm build. use title for new lists not id, also make first user admin

Browse source
This commit is contained in:
j 2011-11-08 18:05:26 +01:00
commit 0eeb3e223d
8 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pandora/app/config.py
View file

@ -41,9 +41,10 @@ def load_config():
settings.CONFIG = config
admin = len(settings.CONFIG['userLevels']) - 1
settings.ADMIN = tuple([(u.username, u.email)
for u in User.objects.filter(profile__level=admin)])
settings.MANAGERS = settings.ADMINS
if not 'syncdb' in sys.argv:
settings.ADMIN = tuple([(u.username, u.email)
for u in User.objects.filter(profile__level=admin)])
settings.MANAGERS = settings.ADMINS
def reloader_thread():
_config_mtime = 0
@ -61,7 +62,11 @@ def update_static():
oxjs_build = os.path.join(settings.STATIC_ROOT, 'oxjs/tools/build/build.py')
if os.path.exists(oxjs_build):
print 'update oxjs'
os.system('%s -nogeo >/dev/null' % oxjs_build)
if os.path.exists(os.path.join(settings.STATIC_ROOT, 'oxjs/build/Ox.Geo/json/Ox.Geo.json')):
geo = '-nogeo'
else:
geo = ''
os.system('%s %s >/dev/null' % (oxjs_build, geo))
data = ''
js = []