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

Bugs gelöst

This commit is contained in:
Holger Trampe 2020-07-04 22:14:54 +02:00
parent 0a674f71ca
commit bdc0ca92ce
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
standards/templates/standards/standards_single.html
View File

@ -230,11 +230,11 @@
Benutzername: <b/>{{pass.agpass_username }}</b><br /> Benutzername: <b/>{{pass.agpass_username }}</b><br />
Passwort: <b/>{{pass.agpass_username }}</b><br /> Passwort: <b/>{{pass.agpass_username }}</b><br />
{% else %} {% else %}
Sie dürfen keine Informationen dieses Passwords einsehen. Sie dürfen keine Informationen dieses Passwortes einsehen.
{% endif %} {% endif %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-success" data-dismiss="modal">Schließen</button> <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
</div> </div>
</div> </div>
</div> </div>

BIN
standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
View File

Binary file not shown.

3
standards/templatetags/counter_tag.py
View File

@ -41,8 +41,7 @@ def has_group(user, group_name):
if g.name == group_name: if g.name == group_name:
in_group = True in_group = True
return in_group return in_group
@register.simple_tag @register.simple_tag
def setbool(value): def setbool(value):
global groupbool global groupbool

4
standards/views.py
View File

@ -257,6 +257,10 @@ def StandardAdd(request, id=False):
standard.freefield_content = normalForm.cleaned_data['freefield_content'] standard.freefield_content = normalForm.cleaned_data['freefield_content']
standard.freefield_title = normalForm.cleaned_data['freefield_title'] standard.freefield_title = normalForm.cleaned_data['freefield_title']
# Clear Users, will set again next step
standard.authority.clear()
standard.executor.clear()
standard.representative.clear()
# ADD NEW INFOS # ADD NEW INFOS
# REPRESENTATIV # REPRESENTATIV

10
users/templates/users/searchres.html
View File

@ -144,9 +144,9 @@
<div class="modal-body"> <div class="modal-body">
{% setbool False %} {% setbool False %}
{% for passgrous in pass.visibleby.all %} {% for passgroup in pass.visibleby.all %}
{% if user|has_group:pass.group.name %} {% if user|has_group:passgroup.group.name %}
{% setbool True %} {% setbool True %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -161,11 +161,11 @@
Benutzername: <b/>{{pass.agpass_username }}</b><br /> Benutzername: <b/>{{pass.agpass_username }}</b><br />
Passwort: <b/>{{pass.agpass_username }}</b><br /> Passwort: <b/>{{pass.agpass_username }}</b><br />
{% else %} {% else %}
Sie dürfen keine Informationen dieses Passwords einsehen. Sie dürfen keine Informationen dieses Passwortes einsehen.
{% endif %} {% endif %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-success" data-dismiss="modal">Schließen</button> <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
</div> </div>
</div> </div>
</div> </div>

4
users/views.py
View File

@ -645,9 +645,9 @@ def GlobalSearch(request):
res_files = DataFile.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) res_files = DataFile.objects.filter(agency__pk=ag).filter(name__icontains=searchfor)
print(res_files)
html = render_to_string('users/searchres.html', {'links': links, 'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers, 'res_news' : res_news, 'res_pass' : res_pass, 'res_contacts' : res_contacts, 'res_files' : res_files}) html = render_to_string('users/searchres.html', {'links': links, 'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers, 'res_news' : res_news, 'res_pass' : res_pass, 'res_contacts' : res_contacts, 'res_files' : res_files, 'user' : request.user})
return HttpResponse(html) return HttpResponse(html)
else: else:
return HttpResponse("Request method is not a GET") return HttpResponse("Request method is not a GET")