Minor improvements

orchestra/conf/project_template/project_name/settings.py

@@ -32,10 +32,19 @@ INSTALLED_APPS = [
     # django-orchestra apps
     'orchestra',
     'orchestra.contrib.accounts',
+    'orchestra.contrib.systemusers',
     'orchestra.contrib.contacts',
     'orchestra.contrib.orchestration',
+    'orchestra.contrib.bills',
+    'orchestra.contrib.payments',
+    'orchestra.contrib.tasks',
+    'orchestra.contrib.mailer',
+    'orchestra.contrib.history',
+    'orchestra.contrib.issues',
+    'orchestra.contrib.services',
+    'orchestra.contrib.plans',
+    'orchestra.contrib.orders',
     'orchestra.contrib.domains',
-    'orchestra.contrib.systemusers',
     'orchestra.contrib.mailboxes',
     'orchestra.contrib.lists',
     'orchestra.contrib.webapps',
@@ -43,16 +52,7 @@ INSTALLED_APPS = [
     'orchestra.contrib.databases',
     'orchestra.contrib.vps',
     'orchestra.contrib.saas',
-    'orchestra.contrib.issues',
-    'orchestra.contrib.services',
-    'orchestra.contrib.plans',
-    'orchestra.contrib.orders',
     'orchestra.contrib.miscellaneous',
-    'orchestra.contrib.bills',
-    'orchestra.contrib.payments',
-    'orchestra.contrib.tasks',
-    'orchestra.contrib.mailer',
-    'orchestra.contrib.history',
 
     # Third-party apps
     'django_extensions',

orchestra/contrib/accounts/forms.py

@@ -1,3 +1,4 @@
+import logging
 from collections import OrderedDict
 
 from django import forms
@@ -11,6 +12,9 @@ from . import settings
 from .models import Account
 
 
+logger = logging.getLogger(__name__)
+
+
 def create_account_creation_form():
     fields = OrderedDict(**{
         'enable_systemuser': forms.BooleanField(initial=True, required=False,
@@ -18,12 +22,18 @@ def create_account_creation_form():
             help_text=_("Designates whether to creates an enabled or disabled related system user. "
                         "Notice that a related system user will be always created."))
     })
-    for model, __, kwargs, help_text in settings.ACCOUNTS_CREATE_RELATED:
+    create_related = []
-        model = apps.get_model(model)
+    for model, key, kwargs, help_text in settings.ACCOUNTS_CREATE_RELATED:
-        field_name = 'create_%s' % model._meta.model_name
+        try:
-        label = _("Create %s") % model._meta.verbose_name
+            model = apps.get_model(model)
-        fields[field_name] = forms.BooleanField(
+        except LookupError:
-            initial=True, required=False, label=label, help_text=help_text)
+            logger.error("%s not installed." % model)
+        else:
+            field_name = 'create_%s' % model._meta.model_name
+            label = _("Create %s") % model._meta.verbose_name
+            fields[field_name] = forms.BooleanField(
+                initial=True, required=False, label=label, help_text=help_text)
+            create_related.append((model, key, kwargs, help_text))
         
     def clean(self):
         """ unique usernames between accounts and system users """
@@ -40,7 +50,7 @@ def create_account_creation_form():
         systemuser_model = Account.main_systemuser.field.rel.to
         if systemuser_model.objects.filter(username=account.username).exists():
             errors['username'] = _("A system user with this name already exists.")
-        for model, key, related_kwargs, __ in settings.ACCOUNTS_CREATE_RELATED:
+        for model, key, related_kwargs, __ in create_related:
             model = apps.get_model(model)
             kwargs = {
                 key: eval(related_kwargs[key], {'account': account})