diff --git a/README.md b/README.md index 5efab89..6ad7ba3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1 @@ -Die Readme ist uns erstmal egal - Commit-Test vom Desktop-PC! - -Online Bearbeitet - Test vom Web! - -Und nun vom Lappi! \ No newline at end of file +digitale agentur - README \ No newline at end of file diff --git a/areas/forms.py b/areas/forms.py index eb1b37f..1646bc3 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 multiselectfield import MultiSelectField from dal import autocomplete from django.contrib.auth.models import User from django import forms @@ -18,4 +17,6 @@ class AreaAddAreaForm(forms.ModelForm): "desc" : "Kurze Beschreibung" } fields = ['name', 'color', 'desc'] - \ No newline at end of file + + + \ No newline at end of file diff --git a/areas/models.py b/areas/models.py index a475969..8bf8b27 100644 --- a/areas/models.py +++ b/areas/models.py @@ -2,7 +2,6 @@ from django.db import models from users.models import Agency from django.urls import reverse from colorful.fields import RGBColorField -from multiselectfield import MultiSelectField from django.contrib.auth.models import User import datetime diff --git a/areas/views.py b/areas/views.py index 560f804..658fce7 100644 --- a/areas/views.py +++ b/areas/views.py @@ -6,6 +6,9 @@ from django.contrib import messages from .forms import AreaAddAreaForm from django.contrib.auth.models import User + + + class AreasManagement(LoginRequiredMixin, ListView): model = Areas # Adding active_link diff --git a/digitaleagentur/__pycache__/__init__.cpython-37.pyc b/digitaleagentur/__pycache__/__init__.cpython-37.pyc index 7c654bb..3b21d40 100644 Binary files a/digitaleagentur/__pycache__/__init__.cpython-37.pyc and b/digitaleagentur/__pycache__/__init__.cpython-37.pyc differ diff --git a/digitaleagentur/__pycache__/settings.cpython-37.pyc b/digitaleagentur/__pycache__/settings.cpython-37.pyc index 0ecbe85..da62a11 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-37.pyc and b/digitaleagentur/__pycache__/settings.cpython-37.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-37.pyc b/digitaleagentur/__pycache__/urls.cpython-37.pyc index 53e52d1..ad7acc7 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-37.pyc and b/digitaleagentur/__pycache__/urls.cpython-37.pyc differ diff --git a/digitaleagentur/__pycache__/wsgi.cpython-37.pyc b/digitaleagentur/__pycache__/wsgi.cpython-37.pyc index 469ffde..5d9363b 100644 Binary files a/digitaleagentur/__pycache__/wsgi.cpython-37.pyc and b/digitaleagentur/__pycache__/wsgi.cpython-37.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index d5164cf..41116c1 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -37,10 +37,7 @@ INSTALLED_APPS = [ 'tasks.apps.TasksConfig', 'standards.apps.StandardsConfig', 'crispy_forms', - 'colorful', - 'dal', - 'dal_select2', - 'multiselectfield', + 'colorful', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/users/__pycache__/__init__.cpython-37.pyc b/users/__pycache__/__init__.cpython-37.pyc index a49bf65..1551615 100644 Binary files a/users/__pycache__/__init__.cpython-37.pyc and b/users/__pycache__/__init__.cpython-37.pyc differ diff --git a/users/__pycache__/admin.cpython-37.pyc b/users/__pycache__/admin.cpython-37.pyc index 4e42457..87e75be 100644 Binary files a/users/__pycache__/admin.cpython-37.pyc and b/users/__pycache__/admin.cpython-37.pyc differ diff --git a/users/__pycache__/apps.cpython-37.pyc b/users/__pycache__/apps.cpython-37.pyc index 53daf6d..7176db1 100644 Binary files a/users/__pycache__/apps.cpython-37.pyc and b/users/__pycache__/apps.cpython-37.pyc differ diff --git a/users/__pycache__/models.cpython-37.pyc b/users/__pycache__/models.cpython-37.pyc index f34a75d..973da42 100644 Binary files a/users/__pycache__/models.cpython-37.pyc and b/users/__pycache__/models.cpython-37.pyc differ diff --git a/users/__pycache__/signals.cpython-37.pyc b/users/__pycache__/signals.cpython-37.pyc index 65935c9..bcf4c6e 100644 Binary files a/users/__pycache__/signals.cpython-37.pyc and b/users/__pycache__/signals.cpython-37.pyc differ diff --git a/users/__pycache__/urls.cpython-37.pyc b/users/__pycache__/urls.cpython-37.pyc index 5bce238..8bc3413 100644 Binary files a/users/__pycache__/urls.cpython-37.pyc and b/users/__pycache__/urls.cpython-37.pyc differ diff --git a/users/__pycache__/usersforms.cpython-37.pyc b/users/__pycache__/usersforms.cpython-37.pyc index 0eb0802..d8dc875 100644 Binary files a/users/__pycache__/usersforms.cpython-37.pyc and b/users/__pycache__/usersforms.cpython-37.pyc differ diff --git a/users/__pycache__/views.cpython-37.pyc b/users/__pycache__/views.cpython-37.pyc index 01b91c1..00e7478 100644 Binary files a/users/__pycache__/views.cpython-37.pyc and b/users/__pycache__/views.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0001_initial.cpython-37.pyc b/users/migrations/__pycache__/0001_initial.cpython-37.pyc index 08d3d8a..67f91f5 100644 Binary files a/users/migrations/__pycache__/0001_initial.cpython-37.pyc and b/users/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc b/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc index 00b9f96..b3f19aa 100644 Binary files a/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc and b/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc b/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc index 85b819a..6d90591 100644 Binary files a/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc and b/users/migrations/__pycache__/0003_auto_20191125_2231.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc index 6701245..d594312 100644 Binary files a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc and b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc b/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc index aeabadf..6a74c05 100644 Binary files a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc and b/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc index 3ca7e34..cb5df2b 100644 Binary files a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc and b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc index d12f8c4..ef69361 100644 Binary files a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc and b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc index 8d5b6ca..2980631 100644 Binary files a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc and b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc b/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc index e3ef698..2ad9d32 100644 Binary files a/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc and b/users/migrations/__pycache__/0009_auto_20191126_2031.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc index e0b8214..cb62287 100644 Binary files a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc and b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc b/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc index 466baf4..8620bfb 100644 Binary files a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc and b/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc index ada4eb2..7ac8899 100644 Binary files a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc and b/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc index 0323ebc..d84dbe8 100644 Binary files a/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc and b/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc index f7adef5..74555eb 100644 Binary files a/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc and b/users/migrations/__pycache__/0014_remove_profile_agency.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc index 8bd9ba2..a89541d 100644 Binary files a/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc and b/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc index 91fc064..f38f6a4 100644 Binary files a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc and b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc index 085ef62..966b58f 100644 Binary files a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc and b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc differ diff --git a/users/migrations/__pycache__/__init__.cpython-37.pyc b/users/migrations/__pycache__/__init__.cpython-37.pyc index 48e511b..c38abe3 100644 Binary files a/users/migrations/__pycache__/__init__.cpython-37.pyc and b/users/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/users/models.py b/users/models.py index 108eb28..befecf3 100644 --- a/users/models.py +++ b/users/models.py @@ -3,6 +3,7 @@ import jsonfield from django.contrib.auth.models import User, AbstractBaseUser from django.conf import settings from PIL import Image + # MAKE EMAIL UNIQUE from django.contrib.auth.models import AbstractUser, User from django.contrib.auth.models import Permission diff --git a/users/templates/users/users_perm.html b/users/templates/users/users_perm.html index 09cd8f0..34351c4 100644 --- a/users/templates/users/users_perm.html +++ b/users/templates/users/users_perm.html @@ -10,7 +10,19 @@