DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

0.7.3 Supportlink korrigiert, generelles Anmeldeproblem LInk hinzugefügt

This commit is contained in:
holger.trampe 2020-01-05 15:47:14 +01:00
parent 188101f6b1
commit 25610e032f
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
users/__pycache__/views.cpython-38.pyc
View File

Binary file not shown.

39
users/templates/users/login.html
View File

@ -3,26 +3,29 @@
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
{% block content %} {% block content %}
<div class="content-section col-md-5"> <div class="content-section col-md-5">
<form method="POST"> <form method="POST">
{% csrf_token %} {% csrf_token %}
<fieldset class="form-group"> <fieldset class="form-group">
<legend class="border-bottom mb-4"> <legend class="border-bottom mb-4">
<h2>Digitale Agentur - Login</h2> <h2>Digitale Agentur - Login</h2>
</legend> </legend>
{{ form|crispy }} {{ form|crispy }}
</fieldset> </fieldset>
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-success">Anmelden</button> <button type="submit" class="btn btn-success">Anmelden</button>
<small class="text-muted ml-2"> <small class="text-muted ml-2">
<a href="{% url 'password-reset' %}" class="">Passwort vergessen?</a><br /> <a href="{% url 'password-reset' %}" class="">Passwort vergessen?</a><br />
</small>
</div>
</form>
<div class="border-top pt-3">
<small class="text-muted">
<!--<a class="ml-2" href="{% url 'register' %}">Agentur anmelden und jetzt digitalisieren!</a>-->
</small> </small>
</div> </div>
</form>
<div class="border-top pt-3">
<small class="text-muted ml-2">
<a href="mailto:support@digitale-agentur.com" class="">Probleme beim anmelden?</a><br />
</small>
<small class="text-muted">
<!--<a class="ml-2" href="{% url 'register' %}">Agentur anmelden und jetzt digitalisieren!</a>-->
</small>
</div> </div>
</div>
{% endblock content %} {% endblock content %}

6
users/views.py
View File

@ -341,6 +341,7 @@ class AgencyUpdateView(LoginRequiredMixin, UpdateView):
Es werden alle Aufgabenbereiche den Bereichen der Agentur zugeordnet und ausgegeben. Es werden alle Aufgabenbereiche den Bereichen der Agentur zugeordnet und ausgegeben.
''' '''
@login_required
def UsersPrio(request, pk): def UsersPrio(request, pk):
user = User.objects.get(pk=pk) user = User.objects.get(pk=pk)
@ -369,6 +370,7 @@ def UsersPrio(request, pk):
im Profil im Profil
''' '''
@login_required
def UsersPrioUpdate(request): def UsersPrioUpdate(request):
tempuser = User.objects.get(pk=request.GET['userid']) tempuser = User.objects.get(pk=request.GET['userid'])
if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk: if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk:
@ -383,6 +385,7 @@ def UsersPrioUpdate(request):
import re import re
def cleanhtml(raw_html): def cleanhtml(raw_html):
cleanr = re.compile('<.*?>') cleanr = re.compile('<.*?>')
cleantext = re.sub(cleanr, '', raw_html) cleantext = re.sub(cleanr, '', raw_html)
@ -403,6 +406,7 @@ def GlobalSearch(request):
else: else:
return HttpResponse("Request method is not a GET") return HttpResponse("Request method is not a GET")
def searchStandardRouter(request): def searchStandardRouter(request):
if request.method == 'GET': if request.method == 'GET':
return redirect('/standards/standard/'+request.GET['s_id']+'/single') return redirect('/standards/standard/'+request.GET['s_id']+'/single')
@ -414,6 +418,7 @@ def searchStandardRouter(request):
Das Update erfolgt per Booleanfields. Das Update erfolgt per Booleanfields.
''' '''
@login_required
def UsersAreaTaskUpdate(request, pk): def UsersAreaTaskUpdate(request, pk):
user = User.objects.get(pk=pk) user = User.objects.get(pk=pk)
@ -493,6 +498,7 @@ def UsersAreaTaskUpdate(request, pk):
return render(request, 'users/users_areatasks.html', context) return render(request, 'users/users_areatasks.html', context)
@login_required
def support(request): def support(request):
context = { context = {
'active_link' : 'support', 'active_link' : 'support',