- Eingeloggter User kann nun nicht mehr das Recht "Benutzer bearbeiten" entfernen, damit sich die User nicht selbst aussperren

- DAL wurde entfernt und etwas anderes für Autocomplete gesucht
- Datenbank auf Laptop aktualisiert (perms.id-Fehler behoben durch zweifaches Abspeichern beim signal)

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!
+digitale agentur - README

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']
-		
+		
+
+	

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
 

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

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',

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

users/templates/users/users_perm.html

@@ -10,7 +10,19 @@
   <!-- FORMS LADEN users/userforms.py und users/views.py -->
   <form method="POST">
 	  	{% csrf_token %}	  	
-	  	{% for field in form %}	  		 
+	  	{% for field in form %}	 
+  			{% if field.name == 'users_usermanagement'%} 	  				 
+  					{% if user_tochange.pk != request.user.pk %} 		 
+  					<div class="custom-control custom-checkbox mb-2">			    
+			  			{% if field.value %}
+			  				<input type="checkbox" name="{{ field.name }}" class="custom-control-input pull-left" id="{{ field.name }}" checked>
+			  			{% else %}
+			  				<input type="checkbox" name="{{ field.name }}" class="custom-control-input pull-left" id="{{ field.name }}">
+			  			{% endif %}
+			    		<label class="custom-control-label" for="{{ field.name }}">{{ field.help_text }}</label>			    
+					</div>		
+  					{%endif %}
+  			{% else %}
 	  		<div class="custom-control custom-checkbox mb-2">			    
 	  			{% if field.value %}
 	  				<input type="checkbox" name="{{ field.name }}" class="custom-control-input pull-left" id="{{ field.name }}" checked>
@@ -19,6 +31,7 @@
 	  			{% endif %}
 			    <label class="custom-control-label" for="{{ field.name }}">{{ field.help_text }}</label>			    
 			</div>
+			{% endif %}
 	  	{% endfor %}
 	  <hr>	  	
 	  	<button type="submit" class="btn btn-success">Berechtigungen speichern</button>&nbsp;