* With postgresql, the DatabaseError exception is not raised into the enabled_extensions function :p

* Fixing a south? related issue with Postgresql and proxy models.

fixes #249
This commit is contained in:
Antoine Nguyen
2012-05-27 11:12:41 +02:00
parent 72e2368727
commit 976b172946
2 changed files with 9 additions and 6 deletions
+8 -5
View File
@@ -40,12 +40,15 @@ def enabled_applications():
:return: a list
"""
from modoboa.lib.dbutils import db_table_exists
result = [("admin", "admin"), ("userprefs", "userprefs")]
try:
exts = Extension.objects.filter(enabled=True)
result += [(ext.name, ext.name) for ext in exts]
except DatabaseError:
pass
if db_table_exists("admin_extension"):
try:
exts = Extension.objects.filter(enabled=True)
result += [(ext.name, ext.name) for ext in exts]
except DatabaseError:
pass
return sorted(result, key=lambda e: e[0])
parameters.register_admin("DEFAULT_TOP_REDIRECTION", type="list", deflt="admin",
+1 -1
View File
@@ -11,7 +11,7 @@ class Migration(SchemaMigration):
# Adding model 'LimitsPool'
db.create_table('limits_limitspool', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['admin.User'], unique=True)),
('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
))
db.send_create_signal('limits', ['LimitsPool'])