diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc index 6e2a2e6..3ff9165 100644 Binary files a/areas/__pycache__/__init__.cpython-38.pyc and b/areas/__pycache__/__init__.cpython-38.pyc differ diff --git a/areas/__pycache__/admin.cpython-38.pyc b/areas/__pycache__/admin.cpython-38.pyc index 46ce1de..c67ec55 100644 Binary files a/areas/__pycache__/admin.cpython-38.pyc and b/areas/__pycache__/admin.cpython-38.pyc differ diff --git a/areas/__pycache__/apps.cpython-38.pyc b/areas/__pycache__/apps.cpython-38.pyc index 7e14167..e7a6b78 100644 Binary files a/areas/__pycache__/apps.cpython-38.pyc and b/areas/__pycache__/apps.cpython-38.pyc differ diff --git a/areas/__pycache__/forms.cpython-38.pyc b/areas/__pycache__/forms.cpython-38.pyc index 498f1ae..8f2aaf5 100644 Binary files a/areas/__pycache__/forms.cpython-38.pyc and b/areas/__pycache__/forms.cpython-38.pyc differ diff --git a/areas/__pycache__/models.cpython-38.pyc b/areas/__pycache__/models.cpython-38.pyc index 7f829de..83d08a8 100644 Binary files a/areas/__pycache__/models.cpython-38.pyc and b/areas/__pycache__/models.cpython-38.pyc differ diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 54005ab..ddff2d1 100644 Binary files a/areas/__pycache__/urls.cpython-38.pyc and b/areas/__pycache__/urls.cpython-38.pyc differ diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index b8e14a5..71cffa9 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/forms.py b/areas/forms.py index fc6eca7..5766343 100644 --- a/areas/forms.py +++ b/areas/forms.py @@ -2,7 +2,6 @@ from django import forms from django.forms import ModelForm from django.forms.widgets import TextInput from .models import Areas -from dal import autocomplete from django.contrib.auth.models import User from django import forms diff --git a/areas/migrations/0001_initial.py b/areas/migrations/0001_initial.py index 9e6a88c..b169754 100644 --- a/areas/migrations/0001_initial.py +++ b/areas/migrations/0001_initial.py @@ -1,5 +1,8 @@ -# Generated by Django 2.2.7 on 2019-12-02 17:34 +# Generated by Django 3.0 on 2019-12-03 22:58 +import colorful.fields +import datetime +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -9,7 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('users', '0038_auto_20191202_1757'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('users', '0001_initial'), ] operations = [ @@ -17,10 +21,14 @@ class Migration(migrations.Migration): name='Areas', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, max_length=200)), - ('color', models.CharField(blank=True, max_length=60)), - ('desc', models.CharField(blank=True, max_length=3000)), + ('name', models.CharField(max_length=200)), + ('color', colorful.fields.RGBColorField(blank=True, colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC')), + ('desc', models.TextField(blank=True, max_length=3000)), + ('created_area_date', models.DateField(blank=True, default=datetime.date.today)), + ('visible', models.BooleanField(default=True)), ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')), + ('created_area_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ('usersfield', models.ManyToManyField(blank=True, related_name='users_in_area', to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/areas/migrations/0002_auto_20191202_2001.py b/areas/migrations/0002_auto_20191202_2001.py deleted file mode 100644 index 6ac470f..0000000 --- a/areas/migrations/0002_auto_20191202_2001.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-02 19:01 - -import colorful.fields -from django.db import migrations, models -import multiselectfield.db.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('areas', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='areas', - name='usersfield', - field=multiselectfield.db.fields.MultiSelectField(blank=True, max_length=200), - ), - migrations.AlterField( - model_name='areas', - name='color', - field=colorful.fields.RGBColorField(colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC'), - ), - migrations.AlterField( - model_name='areas', - name='desc', - field=models.TextField(blank=True, max_length=3000), - ), - ] diff --git a/areas/migrations/0003_auto_20191202_2255.py b/areas/migrations/0003_auto_20191202_2255.py deleted file mode 100644 index 457a9c4..0000000 --- a/areas/migrations/0003_auto_20191202_2255.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-02 21:55 - -import colorful.fields -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('areas', '0002_auto_20191202_2001'), - ] - - operations = [ - migrations.RemoveField( - model_name='areas', - name='usersfield', - ), - migrations.AddField( - model_name='areas', - name='created_by', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='areas', - name='created_date', - field=models.DateField(blank=True, default=datetime.date.today), - ), - migrations.AlterField( - model_name='areas', - name='color', - field=colorful.fields.RGBColorField(blank=True, colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC'), - ), - migrations.AlterField( - model_name='areas', - name='name', - field=models.CharField(max_length=200), - ), - ] diff --git a/areas/migrations/0004_remove_areas_created_by.py b/areas/migrations/0004_remove_areas_created_by.py deleted file mode 100644 index 3d2a275..0000000 --- a/areas/migrations/0004_remove_areas_created_by.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-02 21:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('areas', '0003_auto_20191202_2255'), - ] - - operations = [ - migrations.RemoveField( - model_name='areas', - name='created_by', - ), - ] diff --git a/areas/migrations/0005_auto_20191202_2256.py b/areas/migrations/0005_auto_20191202_2256.py deleted file mode 100644 index a8a4df0..0000000 --- a/areas/migrations/0005_auto_20191202_2256.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-02 21:56 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('areas', '0004_remove_areas_created_by'), - ] - - operations = [ - migrations.RenameField( - model_name='areas', - old_name='created_date', - new_name='created_area_date', - ), - migrations.AddField( - model_name='areas', - name='created_area_by', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/areas/migrations/0006_auto_20191202_2300.py b/areas/migrations/0006_auto_20191202_2300.py deleted file mode 100644 index d61825e..0000000 --- a/areas/migrations/0006_auto_20191202_2300.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-02 22:00 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('areas', '0005_auto_20191202_2256'), - ] - - operations = [ - migrations.AlterField( - model_name='areas', - name='created_area_by', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc index 53914d2..4b1a5c3 100644 Binary files a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc and b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/areas/migrations/__pycache__/__init__.cpython-38.pyc b/areas/migrations/__pycache__/__init__.cpython-38.pyc index bddb65a..1f7cdb4 100644 Binary files a/areas/migrations/__pycache__/__init__.cpython-38.pyc and b/areas/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/__init__.cpython-38.pyc b/digitaleagentur/__pycache__/__init__.cpython-38.pyc index 7637386..f932871 100644 Binary files a/digitaleagentur/__pycache__/__init__.cpython-38.pyc and b/digitaleagentur/__pycache__/__init__.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 7f695ad..79f6a40 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index 62d9742..2a34fc2 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/views.cpython-38.pyc b/digitaleagentur/__pycache__/views.cpython-38.pyc index 10a6bff..ecd32fe 100644 Binary files a/digitaleagentur/__pycache__/views.cpython-38.pyc and b/digitaleagentur/__pycache__/views.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc index ab57581..3e8074e 100644 Binary files a/digitaleagentur/__pycache__/wsgi.cpython-38.pyc and b/digitaleagentur/__pycache__/wsgi.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 8b4b0f1..f3231bd 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -80,17 +80,25 @@ WSGI_APPLICATION = 'digitaleagentur.wsgi.application' # Database # https://docs.djangoproject.com/en/2.2/ref/settings/#databases +#DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.mysql', +# 'NAME' : 'digitaleagentur', +# 'USER' : 'digitaleagentur', +# 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', +# 'PORT' : 3306 +# } +#} DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME' : 'digitaleagentur', - 'USER' : 'digitaleagentur', - 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', + 'USER' : 'root', + 'PASSWORD' : '', 'PORT' : 3306 } } - # Password validation # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators @@ -113,7 +121,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/2.2/topics/i18n/ -LANGUAGE_CODE = 'de-de' +LANGUAGE_CODE = 'de' TIME_ZONE = 'UTC' @@ -129,6 +137,7 @@ LOGIN_REDIRECT_URL = 'users-dashboard' # LOGIN PAGE FOR LOGIN-REDIRECT LOGIN_URL = 'login' + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ @@ -143,17 +152,8 @@ MEDIA_URL = '/media/' # FOR COLORFIELD GRAPPELLI_CLEAN_INPUT_TYPES = False -# ROLLS -''' -Rolle in der BASE.html unter USERS entsprechend einfügen und URL einfügen, damit das Modul auch gefunden wird! -0 = NICHT DIESE ROLLE -1 = HAT DIESE ROLLE - -Wenn adminstrator = 1 dann darf keine andere Rolle 1 sein! Sonst wird das Menü links mehrfach ausgegeben - -''' -#ROLLS = {"administrator": 0, "usermanagement": 0, "areamanagement": 0, "taskmanagement": 0} +# EMAILs EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_HOST = 'smtp.strato.de' EMAIL_PORT = 587 diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc index 43061a4..3efa48c 100644 Binary files a/standards/__pycache__/__init__.cpython-38.pyc and b/standards/__pycache__/__init__.cpython-38.pyc differ diff --git a/standards/__pycache__/admin.cpython-38.pyc b/standards/__pycache__/admin.cpython-38.pyc index 5125f0f..142f54f 100644 Binary files a/standards/__pycache__/admin.cpython-38.pyc and b/standards/__pycache__/admin.cpython-38.pyc differ diff --git a/standards/__pycache__/apps.cpython-38.pyc b/standards/__pycache__/apps.cpython-38.pyc index 6cbc1b3..4552384 100644 Binary files a/standards/__pycache__/apps.cpython-38.pyc and b/standards/__pycache__/apps.cpython-38.pyc differ diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index c0bcc6d..8733a2b 100644 Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/__init__.cpython-38.pyc b/standards/migrations/__pycache__/__init__.cpython-38.pyc index 3c5c64a..29deb7e 100644 Binary files a/standards/migrations/__pycache__/__init__.cpython-38.pyc and b/standards/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc index 21f7865..5761d3d 100644 Binary files a/tasks/__pycache__/__init__.cpython-38.pyc and b/tasks/__pycache__/__init__.cpython-38.pyc differ diff --git a/tasks/__pycache__/admin.cpython-38.pyc b/tasks/__pycache__/admin.cpython-38.pyc index f86aae0..c894904 100644 Binary files a/tasks/__pycache__/admin.cpython-38.pyc and b/tasks/__pycache__/admin.cpython-38.pyc differ diff --git a/tasks/__pycache__/apps.cpython-38.pyc b/tasks/__pycache__/apps.cpython-38.pyc index 4475bdc..1b8289c 100644 Binary files a/tasks/__pycache__/apps.cpython-38.pyc and b/tasks/__pycache__/apps.cpython-38.pyc differ diff --git a/tasks/__pycache__/models.cpython-38.pyc b/tasks/__pycache__/models.cpython-38.pyc index be03d79..1927892 100644 Binary files a/tasks/__pycache__/models.cpython-38.pyc and b/tasks/__pycache__/models.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/__init__.cpython-38.pyc b/tasks/migrations/__pycache__/__init__.cpython-38.pyc index bcd149e..ded374b 100644 Binary files a/tasks/migrations/__pycache__/__init__.cpython-38.pyc and b/tasks/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/users/__pycache__/__init__.cpython-38.pyc b/users/__pycache__/__init__.cpython-38.pyc index 2327460..1988400 100644 Binary files a/users/__pycache__/__init__.cpython-38.pyc and b/users/__pycache__/__init__.cpython-38.pyc differ diff --git a/users/__pycache__/admin.cpython-38.pyc b/users/__pycache__/admin.cpython-38.pyc index d3bbbe0..a7ab0e1 100644 Binary files a/users/__pycache__/admin.cpython-38.pyc and b/users/__pycache__/admin.cpython-38.pyc differ diff --git a/users/__pycache__/apps.cpython-38.pyc b/users/__pycache__/apps.cpython-38.pyc index c69d697..cea3da8 100644 Binary files a/users/__pycache__/apps.cpython-38.pyc and b/users/__pycache__/apps.cpython-38.pyc differ diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index ff6fe7f..81262ec 100644 Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc index e21e0a7..c3ecb59 100644 Binary files a/users/__pycache__/signals.cpython-38.pyc and b/users/__pycache__/signals.cpython-38.pyc differ diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc index 5e4e7cb..6495e0a 100644 Binary files a/users/__pycache__/urls.cpython-38.pyc and b/users/__pycache__/urls.cpython-38.pyc differ diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index 97ab126..484239d 100644 Binary files a/users/__pycache__/usersforms.cpython-38.pyc and b/users/__pycache__/usersforms.cpython-38.pyc differ diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index b4d902c..0d3488f 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 7941537..9e01bff 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.7 on 2019-11-25 19:42 +# Generated by Django 3.0 on 2019-12-03 22:58 from django.conf import settings from django.db import migrations, models @@ -14,17 +14,33 @@ class Migration(migrations.Migration): ] operations = [ + migrations.CreateModel( + name='Agency', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(default='', max_length=200)), + ('inhaber', models.CharField(blank=True, default='', max_length=200)), + ('street', models.CharField(blank=True, default='', max_length=200)), + ('city', models.CharField(blank=True, default='', max_length=200)), + ('email', models.EmailField(blank=True, default='', max_length=254)), + ('phone', models.CharField(blank=True, default='', max_length=20)), + ('agencypic', models.ImageField(blank=True, default='default.jpg', upload_to='agencymain')), + ], + ), migrations.CreateModel( name='Profile', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=60)), - ('prename', models.CharField(max_length=60)), - ('mailaddress', models.EmailField(max_length=60)), - ('phoneland', models.CharField(max_length=60)), - ('phonemobile', models.CharField(max_length=60)), - ('compfunc', models.CharField(max_length=60)), + ('phoneland', models.CharField(blank=True, max_length=60)), + ('phonemobile', models.CharField(blank=True, max_length=60)), + ('func', models.CharField(choices=[('lead', 'Agenturleitung'), ('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='external', max_length=50)), + ('image', models.ImageField(blank=True, default='default.jpg', upload_to='userprofilepics')), + ('compfunc', models.CharField(blank=True, max_length=60)), + ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], + options={ + 'permissions': [('agency_change', 'Agenturinformationen verändern'), ('users_usermanagement', 'Benutzer bearbeiten'), ('tasks_management', 'Aufgabenbereiche bearbeiten'), ('areas_management', 'Bereiche bearbeiten')], + }, ), ] diff --git a/users/migrations/0002_profile_rolls.py b/users/migrations/0002_profile_rolls.py deleted file mode 100644 index 3d802f2..0000000 --- a/users/migrations/0002_profile_rolls.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-25 21:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='rolls', - field=models.CharField(default='', max_length=1000), - ), - ] diff --git a/users/migrations/0003_auto_20191125_2231.py b/users/migrations/0003_auto_20191125_2231.py deleted file mode 100644 index 034a1a8..0000000 --- a/users/migrations/0003_auto_20191125_2231.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-25 21:31 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_profile_rolls'), - ] - - operations = [ - migrations.CreateModel( - name='Agency', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200)), - ], - ), - migrations.AddField( - model_name='profile', - name='agency', - field=models.ForeignKey(default='', on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0004_auto_20191125_2233.py b/users/migrations/0004_auto_20191125_2233.py deleted file mode 100644 index 085bdb0..0000000 --- a/users/migrations/0004_auto_20191125_2233.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-25 21:33 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_auto_20191125_2231'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='agency', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0005_auto_20191125_2258.py b/users/migrations/0005_auto_20191125_2258.py deleted file mode 100644 index e244851..0000000 --- a/users/migrations/0005_auto_20191125_2258.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-25 21:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_auto_20191125_2233'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='compfunc', - field=models.CharField(blank=True, max_length=60), - ), - migrations.AlterField( - model_name='profile', - name='phoneland', - field=models.CharField(blank=True, max_length=60), - ), - migrations.AlterField( - model_name='profile', - name='phonemobile', - field=models.CharField(blank=True, max_length=60), - ), - migrations.AlterField( - model_name='profile', - name='rolls', - field=models.CharField(blank=True, default='', max_length=1000), - ), - ] diff --git a/users/migrations/0006_auto_20191126_1644.py b/users/migrations/0006_auto_20191126_1644.py deleted file mode 100644 index 8170db3..0000000 --- a/users/migrations/0006_auto_20191126_1644.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 15:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0005_auto_20191125_2258'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='rolls', - field=models.CharField(blank=True, default={'administrator': False, 'areamanagament': False, 'taskmanagament': False, 'usermanagement': False}, max_length=2000), - ), - ] diff --git a/users/migrations/0007_auto_20191126_1801.py b/users/migrations/0007_auto_20191126_1801.py deleted file mode 100644 index 2332853..0000000 --- a/users/migrations/0007_auto_20191126_1801.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 17:01 - -from django.db import migrations -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0006_auto_20191126_1644'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='rolls', - field=jsonfield.fields.JSONField(blank=True, default={'administrator': True, 'areamanagament': False, 'taskmanagament': False, 'usermanagement': False}, max_length=2000), - ), - ] diff --git a/users/migrations/0008_auto_20191126_1952.py b/users/migrations/0008_auto_20191126_1952.py deleted file mode 100644 index 8c66a8b..0000000 --- a/users/migrations/0008_auto_20191126_1952.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 18:52 - -from django.db import migrations -import jsonfield.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0007_auto_20191126_1801'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='mailaddress', - ), - migrations.AlterField( - model_name='profile', - name='rolls', - field=jsonfield.fields.JSONField(blank=True, default={'administrator': 0, 'areamanagement': 0, 'taskmanagement': 0, 'usermanagement': 0}, max_length=2000), - ), - ] diff --git a/users/migrations/0009_auto_20191126_2031.py b/users/migrations/0009_auto_20191126_2031.py deleted file mode 100644 index cf76ada..0000000 --- a/users/migrations/0009_auto_20191126_2031.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 19:31 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0008_auto_20191126_1952'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0010_auto_20191126_2119.py b/users/migrations/0010_auto_20191126_2119.py deleted file mode 100644 index 3a8bfd6..0000000 --- a/users/migrations/0010_auto_20191126_2119.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 20:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0009_auto_20191126_2031'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='agency', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0011_auto_20191126_2120.py b/users/migrations/0011_auto_20191126_2120.py deleted file mode 100644 index 70542a9..0000000 --- a/users/migrations/0011_auto_20191126_2120.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 20:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0010_auto_20191126_2119'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0012_remove_profile_agency.py b/users/migrations/0012_remove_profile_agency.py deleted file mode 100644 index 609f134..0000000 --- a/users/migrations/0012_remove_profile_agency.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 20:21 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0011_auto_20191126_2120'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='agency', - ), - ] diff --git a/users/migrations/0013_profile_agency.py b/users/migrations/0013_profile_agency.py deleted file mode 100644 index 8b8da02..0000000 --- a/users/migrations/0013_profile_agency.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 20:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0012_remove_profile_agency'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='agency', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0014_remove_profile_agency.py b/users/migrations/0014_remove_profile_agency.py deleted file mode 100644 index 319fb82..0000000 --- a/users/migrations/0014_remove_profile_agency.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 20:56 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0013_profile_agency'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='agency', - ), - ] diff --git a/users/migrations/0015_profile_agency.py b/users/migrations/0015_profile_agency.py deleted file mode 100644 index 3a6a45f..0000000 --- a/users/migrations/0015_profile_agency.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-26 20:57 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0014_remove_profile_agency'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='agency', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0016_auto_20191127_0846.py b/users/migrations/0016_auto_20191127_0846.py deleted file mode 100644 index 86749ba..0000000 --- a/users/migrations/0016_auto_20191127_0846.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-27 07:46 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0015_profile_agency'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='agency', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency'), - ), - ] diff --git a/users/migrations/0017_remove_profile_rolls.py b/users/migrations/0017_remove_profile_rolls.py deleted file mode 100644 index 5550ecb..0000000 --- a/users/migrations/0017_remove_profile_rolls.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-27 20:34 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0016_auto_20191127_0846'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='rolls', - ), - ] diff --git a/users/migrations/0018_profile_image.py b/users/migrations/0018_profile_image.py deleted file mode 100644 index 9bac2aa..0000000 --- a/users/migrations/0018_profile_image.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-28 16:28 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0017_remove_profile_rolls'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='image', - field=models.ImageField(default='default.jpg', upload_to='profile_pics'), - ), - ] diff --git a/users/migrations/0019_auto_20191128_1853.py b/users/migrations/0019_auto_20191128_1853.py deleted file mode 100644 index 85ccd06..0000000 --- a/users/migrations/0019_auto_20191128_1853.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-28 17:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0018_profile_image'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='func', - field=models.CharField(choices=[('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Außendienst')], default=('external', 'Außendienst'), max_length=50), - ), - migrations.AlterField( - model_name='profile', - name='image', - field=models.ImageField(blank=True, default='default.jpg', upload_to='userprofilepics'), - ), - ] diff --git a/users/migrations/0020_auto_20191128_2029.py b/users/migrations/0020_auto_20191128_2029.py deleted file mode 100644 index f3df776..0000000 --- a/users/migrations/0020_auto_20191128_2029.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-28 19:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0019_auto_20191128_1853'), - ] - - operations = [ - migrations.AlterField( - model_name='profile', - name='func', - field=models.CharField(choices=[('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default=('external', 'Außendienst'), max_length=50), - ), - ] diff --git a/users/migrations/0021_auto_20191128_2252.py b/users/migrations/0021_auto_20191128_2252.py deleted file mode 100644 index 8af5f6e..0000000 --- a/users/migrations/0021_auto_20191128_2252.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-28 21:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0020_auto_20191128_2029'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='name', - ), - migrations.RemoveField( - model_name='profile', - name='prename', - ), - migrations.AlterField( - model_name='profile', - name='func', - field=models.CharField(choices=[('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='external', max_length=50), - ), - ] diff --git a/users/migrations/0022_auto_20191130_2358.py b/users/migrations/0022_auto_20191130_2358.py deleted file mode 100644 index bd59159..0000000 --- a/users/migrations/0022_auto_20191130_2358.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-30 22:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0021_auto_20191128_2252'), - ] - - operations = [ - migrations.AddField( - model_name='agency', - name='agencypic', - field=models.ImageField(blank=True, default='default.jpg', upload_to='agencymain'), - ), - migrations.AddField( - model_name='agency', - name='city', - field=models.CharField(default='', max_length=200), - ), - migrations.AddField( - model_name='agency', - name='email', - field=models.EmailField(default='', max_length=254), - ), - migrations.AddField( - model_name='agency', - name='inhaber', - field=models.CharField(default='', max_length=200), - ), - migrations.AddField( - model_name='agency', - name='phone', - field=models.CharField(default='', max_length=60), - ), - migrations.AddField( - model_name='agency', - name='street', - field=models.CharField(default='', max_length=200), - ), - migrations.AlterField( - model_name='agency', - name='name', - field=models.CharField(default='', max_length=200), - ), - migrations.AlterField( - model_name='profile', - name='func', - field=models.CharField(choices=[('lead', 'Agenturleitung'), ('external', 'Außendienst'), ('indoor', 'Innendienst'), ('trainee', 'Azubi')], default='external', max_length=50), - ), - ] diff --git a/users/migrations/0023_auto_20191201_1118.py b/users/migrations/0023_auto_20191201_1118.py deleted file mode 100644 index 72cccd6..0000000 --- a/users/migrations/0023_auto_20191201_1118.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 10:18 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0022_auto_20191130_2358'), - ] - - operations = [ - migrations.AlterModelOptions( - name='agency', - options={'permissions': [('agency_change', 'Agenturinformationen verändern')]}, - ), - migrations.AlterField( - model_name='agency', - name='city', - field=models.CharField(blank=True, default='', max_length=200), - ), - migrations.AlterField( - model_name='agency', - name='email', - field=models.EmailField(blank=True, default='', max_length=254), - ), - migrations.AlterField( - model_name='agency', - name='inhaber', - field=models.CharField(blank=True, default='', max_length=200), - ), - migrations.AlterField( - model_name='agency', - name='phone', - field=models.CharField(blank=True, default='', max_length=20), - ), - migrations.AlterField( - model_name='agency', - name='street', - field=models.CharField(blank=True, default='', max_length=200), - ), - ] diff --git a/users/migrations/0024_auto_20191201_1130.py b/users/migrations/0024_auto_20191201_1130.py deleted file mode 100644 index cf97ad6..0000000 --- a/users/migrations/0024_auto_20191201_1130.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 10:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0023_auto_20191201_1118'), - ] - - operations = [ - migrations.AlterModelOptions( - name='agency', - options={}, - ), - migrations.AlterModelOptions( - name='profile', - options={'permissions': [('agency_change', 'Agenturinformationen verändern')]}, - ), - ] diff --git a/users/migrations/0025_auto_20191201_1150.py b/users/migrations/0025_auto_20191201_1150.py deleted file mode 100644 index d3d2b1f..0000000 --- a/users/migrations/0025_auto_20191201_1150.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 10:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0024_auto_20191201_1130'), - ] - - operations = [ - migrations.CreateModel( - name='UsersPermission', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('agency_change', models.BooleanField()), - ], - options={ - 'permissions': [('agency_change', 'Agenturinformationen verändern')], - }, - ), - migrations.AlterModelOptions( - name='profile', - options={}, - ), - ] diff --git a/users/migrations/0026_profile_perms.py b/users/migrations/0026_profile_perms.py deleted file mode 100644 index 248879b..0000000 --- a/users/migrations/0026_profile_perms.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 10:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0025_auto_20191201_1150'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='perms', - field=models.OneToOneField(default=None, on_delete=django.db.models.deletion.CASCADE, to='users.UsersPermission'), - ), - ] diff --git a/users/migrations/0027_remove_profile_perms.py b/users/migrations/0027_remove_profile_perms.py deleted file mode 100644 index 62dade1..0000000 --- a/users/migrations/0027_remove_profile_perms.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 10:58 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0026_profile_perms'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='perms', - ), - ] diff --git a/users/migrations/0028_delete_userspermission.py b/users/migrations/0028_delete_userspermission.py deleted file mode 100644 index 2732a19..0000000 --- a/users/migrations/0028_delete_userspermission.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:00 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0027_remove_profile_perms'), - ] - - operations = [ - migrations.DeleteModel( - name='UsersPermission', - ), - ] diff --git a/users/migrations/0029_profile_tt.py b/users/migrations/0029_profile_tt.py deleted file mode 100644 index b8ff98f..0000000 --- a/users/migrations/0029_profile_tt.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0028_delete_userspermission'), - ] - - operations = [ - migrations.AddField( - model_name='profile', - name='tt', - field=models.CharField(blank=True, max_length=60), - ), - ] diff --git a/users/migrations/0030_remove_profile_tt.py b/users/migrations/0030_remove_profile_tt.py deleted file mode 100644 index 7033a00..0000000 --- a/users/migrations/0030_remove_profile_tt.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:03 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0029_profile_tt'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='tt', - ), - ] diff --git a/users/migrations/0031_auto_20191201_1205.py b/users/migrations/0031_auto_20191201_1205.py deleted file mode 100644 index 7180473..0000000 --- a/users/migrations/0031_auto_20191201_1205.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:05 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0030_remove_profile_tt'), - ] - - operations = [ - migrations.CreateModel( - name='UsersPermission', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('agency_change', models.BooleanField()), - ], - options={ - 'permissions': [('agency_change', 'Agenturinformationen verändern')], - }, - ), - migrations.AddField( - model_name='profile', - name='perms', - field=models.OneToOneField(default=None, on_delete=django.db.models.deletion.CASCADE, to='users.UsersPermission'), - ), - ] diff --git a/users/migrations/0032_auto_20191201_1217.py b/users/migrations/0032_auto_20191201_1217.py deleted file mode 100644 index 3a3b278..0000000 --- a/users/migrations/0032_auto_20191201_1217.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:17 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0031_auto_20191201_1205'), - ] - - operations = [ - migrations.RemoveField( - model_name='profile', - name='perms', - ), - migrations.DeleteModel( - name='UsersPermission', - ), - ] diff --git a/users/migrations/0033_userspermission.py b/users/migrations/0033_userspermission.py deleted file mode 100644 index 905b8eb..0000000 --- a/users/migrations/0033_userspermission.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0032_auto_20191201_1217'), - ] - - operations = [ - migrations.CreateModel( - name='UsersPermission', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('agency_change', models.BooleanField()), - ], - options={ - 'permissions': [('agency_change', 'Agenturinformationen verändern')], - }, - ), - ] diff --git a/users/migrations/0034_auto_20191201_1234.py b/users/migrations/0034_auto_20191201_1234.py deleted file mode 100644 index 288a4dc..0000000 --- a/users/migrations/0034_auto_20191201_1234.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 11:34 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0033_userspermission'), - ] - - operations = [ - migrations.DeleteModel( - name='UsersPermission', - ), - migrations.AlterModelOptions( - name='profile', - options={'permissions': [('agency_change', 'Agenturinformationen verändern')]}, - ), - ] diff --git a/users/migrations/0035_auto_20191201_1307.py b/users/migrations/0035_auto_20191201_1307.py deleted file mode 100644 index c232b04..0000000 --- a/users/migrations/0035_auto_20191201_1307.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 12:07 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0034_auto_20191201_1234'), - ] - - operations = [ - migrations.AlterModelOptions( - name='profile', - options={}, - ), - ] diff --git a/users/migrations/0036_auto_20191201_1308.py b/users/migrations/0036_auto_20191201_1308.py deleted file mode 100644 index 371e5d8..0000000 --- a/users/migrations/0036_auto_20191201_1308.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 12:08 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0035_auto_20191201_1307'), - ] - - operations = [ - migrations.AlterModelOptions( - name='profile', - options={'permissions': [('agency_change', 'Agenturinformationen verändern')]}, - ), - ] diff --git a/users/migrations/0037_auto_20191201_1555.py b/users/migrations/0037_auto_20191201_1555.py deleted file mode 100644 index a501f55..0000000 --- a/users/migrations/0037_auto_20191201_1555.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-01 14:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0036_auto_20191201_1308'), - ] - - operations = [ - migrations.AlterModelOptions( - name='profile', - options={'permissions': [('agency_change', 'Agenturinformationen verändern'), ('users_usermanagement', 'Benutzer bearbeiten')]}, - ), - ] diff --git a/users/migrations/0038_auto_20191202_1757.py b/users/migrations/0038_auto_20191202_1757.py deleted file mode 100644 index 2474213..0000000 --- a/users/migrations/0038_auto_20191202_1757.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-02 16:57 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0037_auto_20191201_1555'), - ] - - operations = [ - migrations.AlterModelOptions( - name='profile', - options={'permissions': [('agency_change', 'Agenturinformationen verändern'), ('users_usermanagement', 'Benutzer bearbeiten'), ('tasks_management', 'Aufgabenbereiche bearbeiten'), ('areas_management', 'Bereiche bearbeiten')]}, - ), - ] diff --git a/users/migrations/__pycache__/0001_initial.cpython-38.pyc b/users/migrations/__pycache__/0001_initial.cpython-38.pyc index d55c64a..86fdee3 100644 Binary files a/users/migrations/__pycache__/0001_initial.cpython-38.pyc and b/users/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc b/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc index 58625f1..538803b 100644 Binary files a/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc and b/users/migrations/__pycache__/0002_profile_rolls.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc b/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc index 24508a6..7e82623 100644 Binary files a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc and b/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc index 17b131c..1c1970f 100644 Binary files a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc and b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc index 87bffc9..2500423 100644 Binary files a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc and b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc index 31d3b41..ff3a111 100644 Binary files a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc and b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc index 7ab8d83..8e0f726 100644 Binary files a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc and b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc b/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc index 6fa4625..a5d3cfb 100644 Binary files a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc and b/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc index d392c0d..a54f85f 100644 Binary files a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc and b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc index aa00d84..2c3d8bc 100644 Binary files a/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc and b/users/migrations/__pycache__/0013_profile_agency.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc index 1318691..f23eef7 100644 Binary files a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc and b/users/migrations/__pycache__/0014_remove_profile_agency.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc b/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc index 2437891..379ba5a 100644 Binary files a/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc and b/users/migrations/__pycache__/0015_profile_agency.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc index 61e8fb1..23c1de2 100644 Binary files a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc and b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc index d9d6512..b060818 100644 Binary files a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc and b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc b/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc index 4f1d48b..bee675a 100644 Binary files a/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc and b/users/migrations/__pycache__/0018_profile_image.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc b/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc index 136d2ce..71c62f3 100644 Binary files a/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc and b/users/migrations/__pycache__/0019_auto_20191128_1853.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc b/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc index 21ec972..d514cdb 100644 Binary files a/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc and b/users/migrations/__pycache__/0020_auto_20191128_2029.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc b/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc index b694eb6..b2d9b6b 100644 Binary files a/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc and b/users/migrations/__pycache__/0021_auto_20191128_2252.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc b/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc index 96136b4..4bff923 100644 Binary files a/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc and b/users/migrations/__pycache__/0024_auto_20191201_1130.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc b/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc index ca30212..82a31b1 100644 Binary files a/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc and b/users/migrations/__pycache__/0025_auto_20191201_1150.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc b/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc index 40a9b27..d9d654d 100644 Binary files a/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc and b/users/migrations/__pycache__/0026_profile_perms.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc b/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc index e32bbb5..fdfd67d 100644 Binary files a/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc and b/users/migrations/__pycache__/0027_remove_profile_perms.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc b/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc index e3c109f..135458d 100644 Binary files a/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc and b/users/migrations/__pycache__/0028_delete_userspermission.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc b/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc index dfcd374..980f375 100644 Binary files a/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc and b/users/migrations/__pycache__/0030_remove_profile_tt.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc b/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc index f66708e..cf2d98d 100644 Binary files a/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc and b/users/migrations/__pycache__/0031_auto_20191201_1205.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc b/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc index 1ca0970..b9e3488 100644 Binary files a/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc and b/users/migrations/__pycache__/0032_auto_20191201_1217.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc b/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc index 4576939..507b6d5 100644 Binary files a/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc and b/users/migrations/__pycache__/0033_userspermission.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc b/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc index 184517d..f17347f 100644 Binary files a/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc and b/users/migrations/__pycache__/0035_auto_20191201_1307.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc b/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc index fd7416f..c0fcf18 100644 Binary files a/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc and b/users/migrations/__pycache__/0036_auto_20191201_1308.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc b/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc index 8d42825..68fe1e1 100644 Binary files a/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc and b/users/migrations/__pycache__/0037_auto_20191201_1555.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/__init__.cpython-38.pyc b/users/migrations/__pycache__/__init__.cpython-38.pyc index 881fe24..e100748 100644 Binary files a/users/migrations/__pycache__/__init__.cpython-38.pyc and b/users/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/users/models.py b/users/models.py index befecf3..049e148 100644 --- a/users/models.py +++ b/users/models.py @@ -1,5 +1,4 @@ from django.db import models -import jsonfield from django.contrib.auth.models import User, AbstractBaseUser from django.conf import settings from PIL import Image