From 728121b1bbd549076943f75eda13ab276a75ccfb Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 6 Jun 2016 04:54:05 -0400 Subject: [PATCH 1/3] Add help message when initialsetup migration phase fails. GitLab issue #296. --- mayan/apps/common/management/commands/initialsetup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mayan/apps/common/management/commands/initialsetup.py b/mayan/apps/common/management/commands/initialsetup.py index f2e3a92084..13ddb77745 100644 --- a/mayan/apps/common/management/commands/initialsetup.py +++ b/mayan/apps/common/management/commands/initialsetup.py @@ -1,15 +1,20 @@ 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) post_initial_setup.send(sender=self) From 883e623a15e12fb4365716807941d8dde0c7467a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 6 Jun 2016 04:55:07 -0400 Subject: [PATCH 2/3] User self.setdout instead of print as per documentation: https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/#django.core.management.BaseCommand.style --- mayan/apps/common/management/commands/createsettings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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([ From 043233f79e0a3dd5c153c64be347bf43abfa44e5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 6 Jun 2016 05:15:37 -0400 Subject: [PATCH 3/3] The UserEditView view add the "user" context variable and confuses the base.html template. Update the base template to use *request.user* instead of just *user* to access the currently logged user. GitLab issue #295. --- mayan/apps/appearance/templates/appearance/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 6f09a6b7da..ad81f8e801 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -68,10 +68,10 @@ {% endfor %}