From bdc0ca92ceb469055e7e98753e0876c289483afe Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Sat, 4 Jul 2020 22:14:54 +0200
Subject: [PATCH] =?UTF-8?q?Bugs=20gel=C3=B6st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/standards/standards_single.html |   4 ++--
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 15293 -> 15293 bytes
 standards/templatetags/counter_tag.py         |   3 +--
 standards/views.py                            |   4 ++++
 users/templates/users/searchres.html          |  10 +++++-----
 users/views.py                                |   4 ++--
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/standards/templates/standards/standards_single.html b/standards/templates/standards/standards_single.html
index 91f3cf1..2d7b8c6 100644
--- a/standards/templates/standards/standards_single.html
+++ b/standards/templates/standards/standards_single.html
@@ -230,11 +230,11 @@
             Benutzername: <b/>{{pass.agpass_username }}</b><br />
             Passwort: <b/>{{pass.agpass_username }}</b><br />
           {% else %}
-          Sie dürfen keine Informationen dieses Passwords einsehen.
+          Sie dürfen keine Informationen dieses Passwortes einsehen.
           {% endif %}
       </div>
       <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>
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index e69048649bd9105139e1a2acbebd59bc6dea9240..8e6e9a65e1bc613375b3c13b9253e7e2b59cbc79 100644
GIT binary patch
delta 338
zcmWNLODMwu9LM+FWi$QfId5%VlQBeVC=Qh3AO|BPB<<j&)Fg+wiOcwktjMz@m-Tbt
zFdV$16tWr-376Fl4qlOcj-Suv<9GR8ibGL!stB4VRkzEhcr>tbQPY8PerY_Y<b-w_
z4a|%>MKfQcHqpu{-8ed#7X64G`H5}>`dP2MVTi^0bGZ4fzs4jlVuG0EM(jD3I20Gc
z27BW}*k)708vJ}u2;+#)iMP0tJwrP1z}uuVgt(r3iC?->!cgc;4Io)+(yD<B8BNaz
z%(9k|4V21B<{(ffl}01bBJHL&pi6vNRe+PB>>!4DoD;wp7joy|p)GG9^0J(F1TUTD
z9ju5czgCSc_7z-Xmv+lN4rnO+#3A)XGq~YuksEiCYxSz}!u^sU{$##1RSm63S;SeS
W$#w^Hip6dLM#NFE9BKThI{pWRBYa^1

delta 338
zcmWNLODMwu9LIfknOXmNj%_UST!wi>SaFaXc2EvWB$7foDH?IWNpiqf2~i7$a?md&
zwaH;4E2Y(H9#M+RaB%P{>~s8lE+4Pk>sDNfk`Nc;)f?A6dZ5g!VdsXr16BM|&%?pl
z_(eEr)|{i2PntcnaUo#_oiu45&?7%uC(y@c<ryQi>w=i#w=RS^UM5Dc%$=klJRDAr
zVwXKBQ5>=*bqhYer@kS;$FysN#HY^$?s=VlffsIPT;Z2)!y9z$H-=%522(v?mWfO&
zV3n<`T%bbE%tJtv)MaM_E@`*40bO#C;{XO2&5dA;fxIxLxt_m_1y&af#$G%Heyp*-
z@Cch?u{Nr(&)%XCj#*>7!zuN}pYT&xvV<@<OD1tE`K7BWJn^I~f<IX)H>#i!sf@W|
WX{o*eI>lCF1IEQw>xngfI0FBj>3vrK

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 57ce374..f221c7d 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -41,8 +41,7 @@ def has_group(user, group_name):
 		if g.name == group_name:
 			in_group = True
 	return in_group
-
-
+	
 @register.simple_tag
 def setbool(value):
 	global groupbool
diff --git a/standards/views.py b/standards/views.py
index 93fde8a..0bb646c 100644
--- a/standards/views.py
+++ b/standards/views.py
@@ -257,6 +257,10 @@ def StandardAdd(request, id=False):
 				standard.freefield_content = normalForm.cleaned_data['freefield_content']
 				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
 				# REPRESENTATIV
diff --git a/users/templates/users/searchres.html b/users/templates/users/searchres.html
index 9d1747c..3376a76 100644
--- a/users/templates/users/searchres.html
+++ b/users/templates/users/searchres.html
@@ -144,9 +144,9 @@
       <div class="modal-body">      
            {% setbool False %}
 
-          {% for passgrous in pass.visibleby.all %}
-            {% if user|has_group:pass.group.name %} 
-              {% setbool True %}    
+          {% for passgroup in pass.visibleby.all %}
+            {% if user|has_group:passgroup.group.name %} 
+              {% setbool True %}
             {% endif %}
           {% endfor %}        
 
@@ -161,11 +161,11 @@
             Benutzername: <b/>{{pass.agpass_username }}</b><br />
             Passwort: <b/>{{pass.agpass_username }}</b><br />
           {% else %}
-          Sie dürfen keine Informationen dieses Passwords einsehen.
+          Sie dürfen keine Informationen dieses Passwortes einsehen.
           {% endif %}
       </div>
       <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>
diff --git a/users/views.py b/users/views.py
index 17bb9e9..7e9ccd3 100644
--- a/users/views.py
+++ b/users/views.py
@@ -645,9 +645,9 @@ def GlobalSearch(request):
 
 		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)
 	else:
 		return HttpResponse("Request method is not a GET")