diff --git a/areas/__pycache__/__init__.cpython-38.pyc b/areas/__pycache__/__init__.cpython-38.pyc index 30d31c2..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 cda1b66..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 ef3a5a0..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 42894cb..c9f46ac 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 0f8b47f..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 4a41cf2..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 34faae4..f424ff3 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/migrations/__pycache__/0001_initial.cpython-38.pyc b/areas/migrations/__pycache__/0001_initial.cpython-38.pyc index 7fdd250..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 b38d0f0..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 ac75e04..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 df45778..3fbb428 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 2ada6cb..3e562f2 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 a73478d..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 742abfb..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 40b9761..4999419 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -82,7 +82,7 @@ WSGI_APPLICATION = 'digitaleagentur.wsgi.application' CKEDITOR_JQUERY_URL = '//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js' CKEDITOR_UPLOAD_PATH = "uploadsCK/" # <-- this folder you uploaded image saved in s3 under media folder -CKEDITOR_RESTRICT_BY_USER = True +CKEDITOR_RESTRICT_BY_USER = False CKEDITOR_REQUIRE_STAFF=False AWS_QUERYSTRING_AUTH = True CKEDITOR_IMAGE_BACKEND = "pillow" diff --git a/media/uploadsCK/admin/2019/12/05/anmerkung.png b/media/uploadsCK/admin/2019/12/05/anmerkung.png new file mode 100644 index 0000000..f3a48e9 Binary files /dev/null and b/media/uploadsCK/admin/2019/12/05/anmerkung.png differ diff --git a/media/uploadsCK/admin/2019/12/05/anmerkung_thumb.png b/media/uploadsCK/admin/2019/12/05/anmerkung_thumb.png new file mode 100644 index 0000000..cc96909 Binary files /dev/null and b/media/uploadsCK/admin/2019/12/05/anmerkung_thumb.png differ diff --git a/media/uploadsCK/mschmidt/2019/12/05/anmerkung.png b/media/uploadsCK/mschmidt/2019/12/05/anmerkung.png new file mode 100644 index 0000000..f3a48e9 Binary files /dev/null and b/media/uploadsCK/mschmidt/2019/12/05/anmerkung.png differ diff --git a/media/uploadsCK/mschmidt/2019/12/05/anmerkung_thumb.png b/media/uploadsCK/mschmidt/2019/12/05/anmerkung_thumb.png new file mode 100644 index 0000000..cc96909 Binary files /dev/null and b/media/uploadsCK/mschmidt/2019/12/05/anmerkung_thumb.png differ diff --git a/standards/__pycache__/__init__.cpython-38.pyc b/standards/__pycache__/__init__.cpython-38.pyc index d4d13ac..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 544bd60..a4a2637 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 29e7acd..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__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc index c95268f..1f39393 100644 Binary files a/standards/__pycache__/forms.cpython-38.pyc and b/standards/__pycache__/forms.cpython-38.pyc differ diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index f0076c4..adaf8ca 100644 Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ diff --git a/standards/__pycache__/urls.cpython-38.pyc b/standards/__pycache__/urls.cpython-38.pyc index fd24e82..b0eb4a0 100644 Binary files a/standards/__pycache__/urls.cpython-38.pyc and b/standards/__pycache__/urls.cpython-38.pyc differ diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index 4af9385..b231167 100644 Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ diff --git a/standards/migrations/0002_auto_20191204_1808.py b/standards/migrations/0002_auto_20191205_0809.py similarity index 60% rename from standards/migrations/0002_auto_20191204_1808.py rename to standards/migrations/0002_auto_20191205_0809.py index 93f81e5..f3b2d12 100644 --- a/standards/migrations/0002_auto_20191204_1808.py +++ b/standards/migrations/0002_auto_20191205_0809.py @@ -1,5 +1,6 @@ -# Generated by Django 2.2.7 on 2019-12-04 17:08 +# Generated by Django 3.0 on 2019-12-05 07:09 +import ckeditor_uploader.fields import datetime from django.conf import settings from django.db import migrations, models @@ -10,6 +11,9 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('tasks', '0002_tasks_name'), + ('areas', '0001_initial'), + ('users', '0002_auto_20191204_0857'), ('standards', '0001_initial'), ] @@ -26,12 +30,12 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='standards', - name='last_modifed_by', + name='last_modified_by', field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.PROTECT, related_name='user_modified_standard', to=settings.AUTH_USER_MODEL), ), migrations.AddField( model_name='standards', - name='last_modifed_on', + name='last_modified_on', field=models.DateField(blank=True, default=datetime.date.today), ), migrations.AddField( @@ -44,9 +48,29 @@ class Migration(migrations.Migration): name='published_on', field=models.DateField(blank=True, default=datetime.date.today), ), + migrations.AlterField( + model_name='standards', + name='agency', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency'), + ), + migrations.AlterField( + model_name='standards', + name='area', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='areas.Areas'), + ), + migrations.AlterField( + model_name='standards', + name='content', + field=ckeditor_uploader.fields.RichTextUploadingField(blank=True, verbose_name='Inhalt'), + ), migrations.AlterField( model_name='standards', name='public', field=models.BooleanField(default=False), ), + migrations.AlterField( + model_name='standards', + name='task', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tasks.Tasks'), + ), ] diff --git a/standards/migrations/0003_auto_20191204_1813.py b/standards/migrations/0003_auto_20191204_1813.py deleted file mode 100644 index 9103fee..0000000 --- a/standards/migrations/0003_auto_20191204_1813.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-04 17:13 - -from django.db import migrations -import tinymce.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('standards', '0002_auto_20191204_1808'), - ] - - operations = [ - migrations.AlterField( - model_name='standards', - name='content', - field=tinymce.models.HTMLField(), - ), - ] diff --git a/standards/migrations/0004_auto_20191204_1831.py b/standards/migrations/0004_auto_20191204_1831.py deleted file mode 100644 index 23715b8..0000000 --- a/standards/migrations/0004_auto_20191204_1831.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-04 17:31 - -import ckeditor.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('standards', '0003_auto_20191204_1813'), - ] - - operations = [ - migrations.AlterField( - model_name='standards', - name='content', - field=ckeditor.fields.RichTextField(blank=True, null=True), - ), - ] diff --git a/standards/migrations/0005_auto_20191204_1924.py b/standards/migrations/0005_auto_20191204_1924.py deleted file mode 100644 index 7b2a4a6..0000000 --- a/standards/migrations/0005_auto_20191204_1924.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-04 18:24 - -import ckeditor_uploader.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('standards', '0004_auto_20191204_1831'), - ] - - operations = [ - migrations.AlterField( - model_name='standards', - name='content', - field=ckeditor_uploader.fields.RichTextUploadingField(blank=True), - ), - ] diff --git a/standards/migrations/0006_auto_20191204_2003.py b/standards/migrations/0006_auto_20191204_2003.py deleted file mode 100644 index 8e699a0..0000000 --- a/standards/migrations/0006_auto_20191204_2003.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-04 19:03 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('standards', '0005_auto_20191204_1924'), - ] - - operations = [ - migrations.RenameField( - model_name='standards', - old_name='last_modifed_by', - new_name='last_modified_by', - ), - migrations.RenameField( - model_name='standards', - old_name='last_modifed_on', - new_name='last_modified_on', - ), - ] diff --git a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc index b87b518..8e4ffe6 100644 Binary files a/standards/migrations/__pycache__/0001_initial.cpython-38.pyc and b/standards/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc index b1adb18..3212bf7 100644 Binary files a/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc and b/standards/migrations/__pycache__/0002_auto_20191204_1808.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc new file mode 100644 index 0000000..176d9da Binary files /dev/null and b/standards/migrations/__pycache__/0002_auto_20191205_0809.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc b/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc index 9f0f303..c5f02a1 100644 Binary files a/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc and b/standards/migrations/__pycache__/0003_auto_20191204_1813.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc b/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc index fd9bb41..a7c8716 100644 Binary files a/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc and b/standards/migrations/__pycache__/0004_auto_20191204_1831.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc b/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc index 9b1971c..f0e6a57 100644 Binary files a/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc and b/standards/migrations/__pycache__/0005_auto_20191204_1924.cpython-38.pyc differ diff --git a/standards/migrations/__pycache__/__init__.cpython-38.pyc b/standards/migrations/__pycache__/__init__.cpython-38.pyc index b2c215d..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/standards/models.py b/standards/models.py index 57ec138..ffb5eb0 100644 --- a/standards/models.py +++ b/standards/models.py @@ -1,5 +1,4 @@ from django.db import models -from tinymce.models import HTMLField from django.contrib.auth.models import User from users.models import Agency from django.urls import reverse diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 1db3d56..778fcc2 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -13,12 +13,11 @@
- {% for item in standards_of_agency %} - + {% for item in standards_of_agency %}
- {{item.name}} +

{{item.name}}

 {% if item.created_standard_by == user or perms.users.standard_management %}
Löschen
-
- +
{% endif %}
diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html new file mode 100644 index 0000000..067b061 --- /dev/null +++ b/standards/templates/standards/standards_single.html @@ -0,0 +1,8 @@ +{% extends "users/base.html" %} +{% block content %} +
+ {{standard.media}} + {{standard.content|safe}} +
+ +{% endblock content %} diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html index 3b9a1a8..5995625 100644 --- a/standards/templates/standards/standards_update.html +++ b/standards/templates/standards/standards_update.html @@ -11,7 +11,15 @@ {{editorForm}}

Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht Standards bearbeiten und freischalten wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als Nicht veröffentlicht gesetzt.

-   +   + + {% if perms.users.standard_management %} + {% if standard_status == False %} + Standard veröffentlichen  + {% else %} + Standard unveröffentlichen  + {% endif %} + {% endif %} Abbrechen
diff --git a/standards/urls.py b/standards/urls.py index 4105fcf..54f4842 100644 --- a/standards/urls.py +++ b/standards/urls.py @@ -1,7 +1,6 @@ from django.urls import path from django.contrib.auth import views as auth_views from django.contrib.auth.decorators import login_required, permission_required -#from .views import StandardsManagement, StandardAdd from .views import StandardsManagement, StandardDeleteView from . import views ''' @@ -13,5 +12,7 @@ urlpatterns = [ path('standardadd/', views.StandardAdd, name='standard-add'), path('standardupdate/', views.StandardUpdate, name='standard-update'), path('ajax/loadtasks/', views.load_tasks, name='ajax_loadtasks'), - path('standards//delete', StandardDeleteView.as_view(), name='standard-delete'), + path('standards//delete', StandardDeleteView.as_view(), name='standard-delete'), + path('standard//changestat', views.StandardChangePublic, name="standard-status"), + path('standard//single', views.StandardSingle, name="standard-single") ] diff --git a/standards/views.py b/standards/views.py index 5f61c3a..d5cfefe 100644 --- a/standards/views.py +++ b/standards/views.py @@ -104,9 +104,15 @@ def StandardUpdate(request, id): existing_standard.area = normalForm.cleaned_data['area'] existing_standard.name = normalForm.cleaned_data['name'] existing_standard.content = editorForm.cleaned_data['content'] - existing_standard.public = False + if request.user.has_perm('standard_management'): + messages.success(request, f'Standard {existing_standard.name} aktualisiert!') + else: + if existing_standard.public: + existing_standard.public = False + messages.warning(request, f'Standard {existing_standard.name} aktualisiert und ist nicht mehr öffentlich, damit Änderungen geprüft werden können.') + else: + messages.success(request, f'Standard {existing_standard.name} aktualisiert!') existing_standard.save() - messages.success(request, f'Standard {existing_standard.name} aktualisiert!') return redirect('/standards') else: @@ -117,10 +123,13 @@ def StandardUpdate(request, id): context = { 'normalForm' : normalForm, 'editorForm' : editorForm, - 'active_link' : 'standards' + 'active_link' : 'standards', + 'standard_id' : standard.pk, + 'standard_status' : standard.public } return render(request, 'standards/standards_update.html', context) +@login_required def load_tasks(request): areaid = request.GET.get('areaid') tasks = Tasks.objects.filter(area__id=areaid).order_by('name') @@ -135,4 +144,25 @@ class StandardDeleteView(LoginRequiredMixin, DeleteView): def get_context_data(self, **kwargs): context = super(StandardDeleteView, self).get_context_data(**kwargs) context['active_link'] = 'standards' - return context \ No newline at end of file + return context + +@login_required +def StandardChangePublic(request, pk): + standard = Standards.objects.get(pk=pk) + if standard.public: + standard.public = False + messages.warning(request, f'Standard {standard.name} ist nicht mehr öffentlich!') + else: + standard.public = True + messages.success(request, f'Standard {standard.name} wurde veröffentlicht und ist innerhalb der Agentur sichtbar!') + standard.save() + return redirect('standards') + +@login_required +def StandardSingle(request, pk): + standard = Standards.objects.get(pk=pk) + context = { + 'active_link':'standards', + 'standard' : standard + } + return render(request, 'standards/standards_single.html', context) \ No newline at end of file diff --git a/tasks/__pycache__/__init__.cpython-38.pyc b/tasks/__pycache__/__init__.cpython-38.pyc index b6825b0..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 43ae268..64cf5df 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 cccf356..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__/forms.cpython-38.pyc b/tasks/__pycache__/forms.cpython-38.pyc index 4a42374..bfae0d8 100644 Binary files a/tasks/__pycache__/forms.cpython-38.pyc and b/tasks/__pycache__/forms.cpython-38.pyc differ diff --git a/tasks/__pycache__/models.cpython-38.pyc b/tasks/__pycache__/models.cpython-38.pyc index c2a1882..45cdb3b 100644 Binary files a/tasks/__pycache__/models.cpython-38.pyc and b/tasks/__pycache__/models.cpython-38.pyc differ diff --git a/tasks/__pycache__/urls.cpython-38.pyc b/tasks/__pycache__/urls.cpython-38.pyc index bbb20b4..fbe82ce 100644 Binary files a/tasks/__pycache__/urls.cpython-38.pyc and b/tasks/__pycache__/urls.cpython-38.pyc differ diff --git a/tasks/__pycache__/views.cpython-38.pyc b/tasks/__pycache__/views.cpython-38.pyc index 581a336..da2cc8e 100644 Binary files a/tasks/__pycache__/views.cpython-38.pyc and b/tasks/__pycache__/views.cpython-38.pyc differ diff --git a/tasks/migrations/0003_auto_20191205_0809.py b/tasks/migrations/0003_auto_20191205_0809.py new file mode 100644 index 0000000..ee3cc1d --- /dev/null +++ b/tasks/migrations/0003_auto_20191205_0809.py @@ -0,0 +1,26 @@ +# Generated by Django 3.0 on 2019-12-05 07:09 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('areas', '0001_initial'), + ('users', '0002_auto_20191204_0857'), + ('tasks', '0002_tasks_name'), + ] + + operations = [ + migrations.AlterField( + model_name='tasks', + name='agency', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Agency'), + ), + migrations.AlterField( + model_name='tasks', + name='area', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='areas.Areas'), + ), + ] diff --git a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc index a488890..ff34734 100644 Binary files a/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc and b/tasks/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc index a063065..d481111 100644 Binary files a/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc and b/tasks/migrations/__pycache__/0002_tasks_name.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc new file mode 100644 index 0000000..b9a34c0 Binary files /dev/null and b/tasks/migrations/__pycache__/0003_auto_20191205_0809.cpython-38.pyc differ diff --git a/tasks/migrations/__pycache__/__init__.cpython-38.pyc b/tasks/migrations/__pycache__/__init__.cpython-38.pyc index 11e65aa..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 a18065b..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 ecc0bbd..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 eb52b10..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 02990ae..30d9168 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 09da039..5fbd890 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 16ecda0..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 22b2bd8..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 105ee35..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/__pycache__/0001_initial.cpython-38.pyc b/users/migrations/__pycache__/0001_initial.cpython-38.pyc index 60c7420..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_auto_20191204_0857.cpython-38.pyc b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc index e4eeaf4..ffe61ff 100644 Binary files a/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc and b/users/migrations/__pycache__/0002_auto_20191204_0857.cpython-38.pyc differ diff --git a/users/migrations/__pycache__/__init__.cpython-38.pyc b/users/migrations/__pycache__/__init__.cpython-38.pyc index 593ee64..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/templates/users/base.html b/users/templates/users/base.html index 827d344..d86a39c 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -220,10 +220,12 @@
{% endfor %} {% endif %}