Merge remote-tracking branch 'merino/master'

This commit is contained in:
Ales Zoulek 2011-11-04 22:26:54 +01:00
commit 9d76fb708a
3 changed files with 11 additions and 5 deletions

View file

@ -57,6 +57,10 @@ class ConstanceAdmin(admin.ModelAdmin):
self.admin_site.admin_view(self.changelist_view),
name='%s_%s_changelist' % info
),
url(r'^$',
self.admin_site.admin_view(self.changelist_view),
name='%s_%s_add' % info
),
)
@csrf_protect_m
@ -76,7 +80,6 @@ class ConstanceAdmin(admin.ModelAdmin):
return HttpResponseRedirect('.')
context = {
'config': [],
'root_path': self.admin_site.root_path,
'title': _('Constance config'),
'app_label': 'constance',
'opts': Config._meta,
@ -108,8 +111,11 @@ class ConstanceAdmin(admin.ModelAdmin):
def has_delete_permission(self, *args, **kwargs):
return False
def has_change_permission(self, *args, **kwargs):
return True
def has_change_permission(self, request, obj=None, *args, **kwargs):
if request.user.is_superuser:
return True
else:
return False
class Config(object):

View file

@ -56,4 +56,4 @@ class DatabaseBackend(Backend):
def clear(self, sender, instance, created, **kwargs):
if db_cache and not created:
db_cache.clear()
db_cache.delete_many(settings.CONFIG.keys())

View file

@ -26,4 +26,4 @@ class Config(object):
self._backend.set(key, value)
def __dir__(self):
return settings.CONFIG.iterkeys()
return settings.CONFIG.keys()