From 9013793b5c348221ed23c166a8f2869dd35c3148 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 4 May 2016 02:40:28 -0400 Subject: [PATCH] Fix migrations conflicts with development branch. --- .../migrations/0006_auto_20160504_0638.py | 19 +++++++++ .../0029_documenttype_organization.py | 21 ---------- .../migrations/0030_document_organization.py | 21 ---------- .../0031_remove_document_organization.py | 18 -------- ...4.py => 0034_documenttype_organization.py} | 8 ++-- ...ization.py => 0007_folder_organization.py} | 5 +-- .../migrations/0005_auto_20160504_0638.py | 34 +++++++++++++++ mayan/apps/organizations/models.py | 5 ++- .../migrations/0002_auto_20160504_0638.py | 42 +++++++++++++++++++ 9 files changed, 104 insertions(+), 69 deletions(-) create mode 100644 mayan/apps/django_gpg/migrations/0006_auto_20160504_0638.py delete mode 100644 mayan/apps/documents/migrations/0029_documenttype_organization.py delete mode 100644 mayan/apps/documents/migrations/0030_document_organization.py delete mode 100644 mayan/apps/documents/migrations/0031_remove_document_organization.py rename mayan/apps/documents/migrations/{0032_auto_20160307_0504.py => 0034_documenttype_organization.py} (70%) rename mayan/apps/folders/migrations/{0005_folder_organization.py => 0007_folder_organization.py} (79%) create mode 100644 mayan/apps/motd/migrations/0005_auto_20160504_0638.py create mode 100644 mayan/apps/user_management/migrations/0002_auto_20160504_0638.py diff --git a/mayan/apps/django_gpg/migrations/0006_auto_20160504_0638.py b/mayan/apps/django_gpg/migrations/0006_auto_20160504_0638.py new file mode 100644 index 0000000000..b2a65a9abd --- /dev/null +++ b/mayan/apps/django_gpg/migrations/0006_auto_20160504_0638.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('django_gpg', '0005_remove_key_key_id'), + ] + + operations = [ + migrations.AlterField( + model_name='key', + name='key_data', + field=models.TextField(help_text='ASCII armored version of the key.', verbose_name='Key data'), + ), + ] diff --git a/mayan/apps/documents/migrations/0029_documenttype_organization.py b/mayan/apps/documents/migrations/0029_documenttype_organization.py deleted file mode 100644 index bf0504e52f..0000000000 --- a/mayan/apps/documents/migrations/0029_documenttype_organization.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('organizations', '0001_initial'), - ('documents', '0028_newversionblock'), - ] - - operations = [ - migrations.AddField( - model_name='documenttype', - name='organization', - field=models.ForeignKey(default=1, to='organizations.Organization'), - preserve_default=False, - ), - ] diff --git a/mayan/apps/documents/migrations/0030_document_organization.py b/mayan/apps/documents/migrations/0030_document_organization.py deleted file mode 100644 index d24344498f..0000000000 --- a/mayan/apps/documents/migrations/0030_document_organization.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('organizations', '0001_initial'), - ('documents', '0029_documenttype_organization'), - ] - - operations = [ - migrations.AddField( - model_name='document', - name='organization', - field=models.ForeignKey(default=1, to='organizations.Organization'), - preserve_default=False, - ), - ] diff --git a/mayan/apps/documents/migrations/0031_remove_document_organization.py b/mayan/apps/documents/migrations/0031_remove_document_organization.py deleted file mode 100644 index ddafccbcb9..0000000000 --- a/mayan/apps/documents/migrations/0031_remove_document_organization.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('documents', '0030_document_organization'), - ] - - operations = [ - migrations.RemoveField( - model_name='document', - name='organization', - ), - ] diff --git a/mayan/apps/documents/migrations/0032_auto_20160307_0504.py b/mayan/apps/documents/migrations/0034_documenttype_organization.py similarity index 70% rename from mayan/apps/documents/migrations/0032_auto_20160307_0504.py rename to mayan/apps/documents/migrations/0034_documenttype_organization.py index ec74666d13..f51cc00d01 100644 --- a/mayan/apps/documents/migrations/0032_auto_20160307_0504.py +++ b/mayan/apps/documents/migrations/0034_documenttype_organization.py @@ -1,21 +1,21 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models import organizations.shortcuts class Migration(migrations.Migration): dependencies = [ - ('documents', '0031_remove_document_organization'), + ('organizations', '0001_initial'), + ('documents', '0033_auto_20160325_0052'), ] operations = [ - migrations.AlterField( + migrations.AddField( model_name='documenttype', name='organization', field=models.ForeignKey(default=organizations.shortcuts.get_current_organization, to='organizations.Organization'), - preserve_default=True, ), ] diff --git a/mayan/apps/folders/migrations/0005_folder_organization.py b/mayan/apps/folders/migrations/0007_folder_organization.py similarity index 79% rename from mayan/apps/folders/migrations/0005_folder_organization.py rename to mayan/apps/folders/migrations/0007_folder_organization.py index 4715175d72..39f066e146 100644 --- a/mayan/apps/folders/migrations/0005_folder_organization.py +++ b/mayan/apps/folders/migrations/0007_folder_organization.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models import organizations.shortcuts @@ -9,7 +9,7 @@ class Migration(migrations.Migration): dependencies = [ ('organizations', '0001_initial'), - ('folders', '0004_documentfolder'), + ('folders', '0006_auto_20160308_0445'), ] operations = [ @@ -17,6 +17,5 @@ class Migration(migrations.Migration): model_name='folder', name='organization', field=models.ForeignKey(default=organizations.shortcuts.get_current_organization, to='organizations.Organization'), - preserve_default=True, ), ] diff --git a/mayan/apps/motd/migrations/0005_auto_20160504_0638.py b/mayan/apps/motd/migrations/0005_auto_20160504_0638.py new file mode 100644 index 0000000000..2f87651d4c --- /dev/null +++ b/mayan/apps/motd/migrations/0005_auto_20160504_0638.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('motd', '0004_auto_20160314_0040'), + ] + + operations = [ + migrations.AlterField( + model_name='message', + name='end_datetime', + field=models.DateTimeField(help_text='Date and time until when this message is to be displayed.', null=True, verbose_name='End date time', blank=True), + ), + migrations.AlterField( + model_name='message', + name='label', + field=models.CharField(help_text='Short description of this message.', max_length=32, verbose_name='Label'), + ), + migrations.AlterField( + model_name='message', + name='message', + field=models.TextField(help_text='The actual message to be displayed.', verbose_name='Message'), + ), + migrations.AlterField( + model_name='message', + name='start_datetime', + field=models.DateTimeField(help_text='Date and time after which this message will be displayed.', null=True, verbose_name='Start date time', blank=True), + ), + ] diff --git a/mayan/apps/organizations/models.py b/mayan/apps/organizations/models.py index 93b0df81ce..cbcb1494a1 100644 --- a/mayan/apps/organizations/models.py +++ b/mayan/apps/organizations/models.py @@ -26,8 +26,9 @@ class OrganizationManager(models.Manager): except AttributeError: raise ImproperlyConfigured( "You're using the Django \"organizations framework\" without " - "having set the ORGANIZATION_ID setting. Create a site in " - "your database and set the SITE_ID setting to fix this error." + "having set the ORGANIZATION_ID setting. Create an " + "organization in your database and set the ORGANIZATION_ID " + "setting to fix this error." ) try: current_organization = ORGANIZATION_CACHE[oid] diff --git a/mayan/apps/user_management/migrations/0002_auto_20160504_0638.py b/mayan/apps/user_management/migrations/0002_auto_20160504_0638.py new file mode 100644 index 0000000000..0abd627008 --- /dev/null +++ b/mayan/apps/user_management/migrations/0002_auto_20160504_0638.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import django.core.validators +import django.contrib.auth.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user_management', '0001_initial'), + ] + + operations = [ + migrations.AlterModelManagers( + name='mayanuser', + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.AlterField( + model_name='mayanuser', + name='email', + field=models.EmailField(max_length=254, verbose_name='email address', blank=True), + ), + migrations.AlterField( + model_name='mayanuser', + name='groups', + field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'), + ), + migrations.AlterField( + model_name='mayanuser', + name='last_login', + field=models.DateTimeField(null=True, verbose_name='last login', blank=True), + ), + migrations.AlterField( + model_name='mayanuser', + name='username', + field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'), + ), + ]