cablegates

This commit is contained in:
j 2011-09-05 15:03:14 +02:00
commit 7b073b2f98
11 changed files with 376 additions and 19 deletions

View file

@ -25,16 +25,16 @@ class SiteSettings(models.Model):
def __unicode__(self):
return self.key
with open(settings.SITE_CONFIG) as f:
config = json.load(f)
config['site']['id'] = settings.SITEID
config['site']['name'] = settings.SITENAME
config['site']['sectionName'] = settings.SITENAME
config['site']['url'] = settings.URL
config['keys'] = {}
for key in config['itemKeys']:
config['keys'][key['id']] = key
def site_config():
with open(settings.SITE_CONFIG) as f:
site_config = json.load(f)
site_config['site']['id'] = settings.SITEID
site_config['site']['name'] = settings.SITENAME
site_config['site']['sectionName'] = settings.SITENAME
site_config['site']['url'] = settings.URL
site_config['keys'] = {}
for key in site_config['itemKeys']:
site_config['keys'][key['id']] = key
return site_config
return config.copy()