matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix migrations conflicts with development branch.

Browse Source
This commit is contained in:
Roberto Rosario
2016-05-04 02:40:28 -04:00
parent bd3bdb9b13
commit 9013793b5c
9 changed files with 104 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mayan/apps/django_gpg/migrations/0006_auto_20160504_0638.py Normal file
View File

@@ -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'),
),
]

21
mayan/apps/documents/migrations/0029_documenttype_organization.py
View File

@@ -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,
),
]

21
mayan/apps/documents/migrations/0030_document_organization.py
View File

@@ -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,
),
]

18
mayan/apps/documents/migrations/0031_remove_document_organization.py
View File

@@ -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',
),
]

8
mayan/apps/documents/migrations/0032_auto_20160307_0504.py → mayan/apps/documents/migrations/0034_documenttype_organization.py
View File

@@ -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,
),
]

5
mayan/apps/folders/migrations/0005_folder_organization.py → mayan/apps/folders/migrations/0007_folder_organization.py
View File

@@ -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,
),
]

34
mayan/apps/motd/migrations/0005_auto_20160504_0638.py Normal file
View File

@@ -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),
),
]

5
mayan/apps/organizations/models.py
View File

@@ -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]

42
mayan/apps/user_management/migrations/0002_auto_20160504_0638.py Normal file
View File

@@ -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'),
),
]