diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 8af45561cf..510909ddef 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -68,10 +68,10 @@ {% endfor %}
diff --git a/mayan/apps/common/management/commands/createsettings.py b/mayan/apps/common/management/commands/createsettings.py index df6069cd64..93f61a613d 100644 --- a/mayan/apps/common/management/commands/createsettings.py +++ b/mayan/apps/common/management/commands/createsettings.py @@ -18,7 +18,7 @@ class Command(management.BaseCommand): def handle(self, *args, **options): path = os.path.join(settings.BASE_DIR, 'mayan', 'settings', 'local.py') if os.path.exists(path): - print 'Existing file at: {0}. Backup, remove this file and try again.'.format(path) + self.stdout.write(self.style.NOTICE('Existing settings file at: {0}. Backup, remove this file, and try again.'.format(path))) else: with open(path, 'w+') as file_object: file_object.write('\n'.join([ diff --git a/mayan/apps/common/management/commands/initialsetup.py b/mayan/apps/common/management/commands/initialsetup.py index f78b92fcc9..0ef0c88ab2 100644 --- a/mayan/apps/common/management/commands/initialsetup.py +++ b/mayan/apps/common/management/commands/initialsetup.py @@ -1,16 +1,21 @@ from __future__ import unicode_literals from django.core import management +from django.db.utils import OperationalError from ...signals import post_initial_setup class Command(management.BaseCommand): - help = 'Gets Mayan EDMS ready to be used.' + help = 'Initializes an install and gets it ready to be used.' def handle(self, *args, **options): management.call_command('createsettings', interactive=False) - management.call_command('migrate', interactive=False) + try: + result = management.call_command('migrate', interactive=False) + except OperationalError as exception: + self.stderr.write(self.style.NOTICE('Unable to migrate the database. The initialsetup command is to be used only on new installations. To upgrade existing installations use the performupgrade command.')) + raise management.call_command('createautoadmin', interactive=False) management.call_command('createorganizationadmin', interactive=False) post_initial_setup.send(sender=self)