diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html index a995ef1..a4277e4 100644 --- a/standards/templates/standards/standards_single.html +++ b/standards/templates/standards/standards_single.html @@ -15,6 +15,13 @@  | Bearbeiten {% endif%} +
+ Ansprechpartner: + {% for taskuser in standard.task.usersfield.all %} + +  {{taskuser.first_name}} {{taskuser.last_name}} + {% endfor %} +

{{standard.media}} {{standard.content|safe}} diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index abe771a..043095a 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 dba6ffd..b2ed99c 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html index aa1f18f..c991337 100644 --- a/users/templates/users/users_management.html +++ b/users/templates/users/users_management.html @@ -50,15 +50,14 @@ Rechte - Zuständigkeitenn + Zuständigkeiten {% if item != request.user %} - - Löschen + + Löschen {% endif %} - {% endfor %} diff --git a/users/usersforms.py b/users/usersforms.py index cb6032e..3ff256c 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -107,4 +107,4 @@ class SupportForm(forms.Form): self.fields['name'] = forms.CharField(required=True, label="Ihr Name", initial=user_name) self.fields['mail'] = forms.EmailField(required=True, label="E-Mail", initial=user.email) self.fields['problemconc'] = forms.CharField(required=True, label="Problemzusammenfassung") - self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Beschreibung") + self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Beschreibung") \ No newline at end of file diff --git a/users/views.py b/users/views.py index 5ef0273..7e636a8 100644 --- a/users/views.py +++ b/users/views.py @@ -406,17 +406,17 @@ def support(request): if request.method == 'POST': form = request.POST supportdata = dict(form) - + # Data from Form to JSON-Format name = str(supportdata['name'][0]) mail = str(supportdata['mail'][0]) problemconc = str(supportdata['problemconc'][0]) problem = str(supportdata['problem'][0]) - + # HEADERS CURL headers = {'X-API-Key': 'F025A238EB74914E3653BA2989BFF7C4'} subject = "Digitale Agentur: " + str(problemconc) - + # DataJSON ostdata = { "topicId" : '12', "name": name, @@ -424,12 +424,10 @@ def support(request): "subject": 'Digitale Agentur: '+problemconc, "ip": "1.1.1.1", "message": problem, - } - - json_data = json.dumps(ostdata) - + } + json_data = json.dumps(ostdata) r = requests.post("https://support.vh-solutions.de/api/http.php/tickets.json", data=json_data, headers=headers) - + # IF request FAILED error-Message if(r.status_code != 201): messages.warning(request, f'Supportanfrage fehlgeschlagen!') else: