From 923e400bc39aa092661e04a9adb9569793b49dce Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Mon, 17 Feb 2020 23:21:40 +0100
Subject: [PATCH] =?UTF-8?q?Bug=20Dateien=20noch=20gel=C3=B6st,=20hat=20was?=
 =?UTF-8?q?=20mit=20dem=20Signal=20und=20den=20Gruppen=20zu=20tun.=20Anson?=
 =?UTF-8?q?sten=20Editor-Bug=20f=C3=BCr=20IE=20gesondert=20gel=C3=B6st.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloud/__pycache__/views.cpython-38.pyc        | Bin 5258 -> 5258 bytes
 cloud/templates/cloud/cloud_main.html         |  21 ++++++++++++------
 .../__pycache__/settings.cpython-38.pyc       | Bin 3625 -> 3704 bytes
 digitaleagentur/settings.py                   |   4 +++-
 standards/__pycache__/views.cpython-38.pyc    | Bin 9026 -> 9049 bytes
 .../templates/standards/standards_add.html    |  21 ++++++++++++++++++
 .../standards/standards_management.html       |   8 +++----
 .../templates/standards/standards_update.html |  21 ++++++++++++++++++
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 2003 -> 2003 bytes
 standards/templatetags/counter_tag.py         |   9 ++++----
 standards/views.py                            |  21 +++++++++---------
 users/__pycache__/signals.cpython-38.pyc      | Bin 3956 -> 3970 bytes
 users/signals.py                              |   6 +++--
 users/templates/users/base.html               |  11 +++++++--
 14 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/cloud/__pycache__/views.cpython-38.pyc b/cloud/__pycache__/views.cpython-38.pyc
index 438869913aeaf926bcb162bf8f059c21e3aee358..c87acb8b457dc823e17fbaade8d29b7624c9e001 100644
GIT binary patch
delta 20
ZcmeCu?9${8<>lpK00O0jUK_dVMF1=F1V;b>

delta 20
ZcmeCu?9${8<>lpK0D@O;o*TLAMF1~E1hW7D

diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html
index 4118feb..3c45be5 100644
--- a/cloud/templates/cloud/cloud_main.html
+++ b/cloud/templates/cloud/cloud_main.html
@@ -62,19 +62,26 @@ a.disabled {
 	  </thead>
 	  <tbody>	 
       	{% for d in dirs %}  
-
+        
         {% setbool False %}
+
         {% for ag in d.visibleby.all %}
-          {% if user|has_group:ag.group.name %}   
-            {% setbool True %}                  
-            {% endif %}
+          {% if user|has_group:ag.group.name %} 
+            {% setbool True %}    
+          {% endif %}
         {% endfor %}
 
-        {% if d.visibleby.all|length == 0 %}
-          {% setbool True %}  
-        {% endif %}
+        {{d.name}}
+        {{d.visibleby.all|length}}
 
+        {% if d.visibleby.all|length == 0 %}
+          DARF
+          {% setbool True %}          
+        {% endif %}
+        
         {% getbool as groupchecker %}
+        {{groupchecker}}
+        
       	<tr id="dir_{{d.pk}}" class="droppable_tr">  	
           	<td id="dir_{{d.pk}}_icon"><i class="fas fa-folder" ></i>                
             </td>
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index b7643bc4aa38dcbad1215eb604fd89af28f49281..d52e8ae9a57974e51167d1500e43d239dde6cf7e 100644
GIT binary patch
delta 425
zcmZWjOD_Xq6rFE6GZBnuX))-NJ}C99XIpRej&ySun#P$-Mrf0kh>dP-#ZH>grC9cl
z@Cz(#`~-HsPArIfbI-l^+>_k%q<w1Pw5rw%Jj!3GqX)Ynyw{fB;p9t#S21@R&X?da
zoYVj}Jn+H?KL#*}fKf+{2$G7BAwWhLLl{N`BZg!$jFu&XQ4^xnj4_O3g6AZrFkO~S
zMlFb8hO1(jwQ$bDd6O9uwPJzVut@EY$<C_-r8spWK@KFzi6!dN*@^gQv#?v2E3Cq>
z>=3BOVl=%6D;1G?u}XbEjDj`J^kbb|h?5%|<iRF+ks=>|;KvpXV4DVc4`2s1gF)<K
z5BnzLb4Y=BC<G6x_w3DP=iW}TIU}FBDC&hw*3fh3#p;!O%mUH>hsc=;oa&d^f*wh8
feX=I6zA85gd$}WZ(ZR$INfX(h{FEB*p4IDbC<}3p

delta 355
zcmYjLxlY4S5cG5GL<$%J2^g?}+>T@JBite3OgIZfvjq)fSx!Si4f%#BZG>=v5Ve1U
zf1se^4}gjniz2(4*`3j9cfa*F-MUtksKDbjR=cSu1mUwQdPC)+!g1edS$9oGr9LE)
zLK+!lkwe~zP(KV(P;dmuFj0hs8O%D8%P`lG97Y3}r$H=W5lcLmv4Yi(>@td>gf%`@
z!g|0P0dKm@k!T28G>mPEL#71B2zF=`%`&Ojr7=`!+-42&ITY}OEqlyksHy^Kfuq|R
z_B@d$u}@R~P8bK=nZ_X{`LYy_D2-#vphj7KAcs2TaY6>K1)QS$poue_<HBXUFG9Q$
lMDx;rVjm&DCEqgNh&+VZd;3Kx$G;>^WIg#KMccp1;~yfGR|fz9

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 5e0558e..4f0e398 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -55,7 +55,8 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'bootstrap_datepicker_plus',
-    'django_cleanup'
+    'django_cleanup',
+    'django_user_agents',
 ]
 
 MIDDLEWARE = [
@@ -66,6 +67,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django_user_agents.middleware.UserAgentMiddleware',
 ]
 
 ROOT_URLCONF = 'digitaleagentur.urls'
diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc
index 6f6b600a21b17a33dc07df86e9e0db6c74fc03ef..7f6d2b2706b62dd877a2f8f70d633da4a2fc8d3e 100644
GIT binary patch
delta 565
zcmY*WO=uHA6y7)8Y~yBklkBFuuBK^{R&ArvyC6i69{edDv;{%i;)<{-fld}dm`zHP
zQ!o;E*NQ0=#G~xRgHR|KDR>k?MeyK759-CE;M-CU&hWmOdEfWVyqVdX|1huL)OA&&
z_64ro*?*y5HJ}^aGCY7sxSO6{9tAT(^-l~>Zc82T%(^@PKKhrrB;78ADUtF|3CU0T
zv$3kKkYdNP!XpD%-)YG4Oe6*K=MLC$Vpjxlgvzjj)r{M=yj-7!+I=b1g+_Z8Lqizk
zIDP0~Tod}RB8+VSX~5PsF(zceyb02jDUJ#yIOBsqc~C{cpYpPO2&zHxzntaSeHP!r
zmB^)g&XyXcgR?@y*O`&Yf!^Q-zfQ<YF)ZMd>;{~}g84G>acu2g1K*qbu!cjcrm-Rz
zkOP&;2^)V{GtfdS_XgVdDL0+{Ozx&aATf<Zd^1W<Tmb0cHG3)1rSvy^ZntPX>r~+v
zE;@DS;+|7>JH&mZXvY7M1Uc?Z8|R(qkFyH!8<$-ddeK970TNu02HzfQG61}I{2iTb
z=eMAMQU0gWCXPSGTFSxQ$sSaq%Y~-^8~A<d72&gD1J0vengbTqN)I5@ishRz#1-%!
Vj>>o4MFy&3W(iXi`NJ{I;4c!Wln(#^

delta 547
zcmY*V&ubG=5Z>>ZZey~$-DEev+n6TRnrb|F@o0-u5XFl~rC_miLD^!^Z4eJ{Q%z14
zA}fQpf+_e9)b*esDjpO(ix9zs2p$9xJmsP|8$swB=3{2QnRy>GSbVdnU)1%4!moPm
z%*w-E{hWat;j-ZXx9QbH?d%hoaA*1lca+o0<+7iYN%xRc+_*a%)z;MjUf`tt{Q+(U
z%~%x4xD@W;5j)Q870Dc<+ON}sS=dZFR!{iaRmIn(#ycy%Aq}3G`#&+1dcQ7>9YEo&
zL%C1Jq;PERsj}y#+B)LGof@eqy9b<953QrE%AQ)<$@D}QPPU-%l<wrV6aGZ2Ar%^!
zZ|QN$6dq_dbqB}jc={QAEoLZYJw=nATk{4q7_gBLF=0ZbF?$9+&DrnNHlN9>(F4n(
zL?&r};&eleZYMPE_wI5;zeO=Tm8k$7a<WTfU9Nqj*V#7bCvy$_pzFDHbZL;Q7COv*
zVc&@EA4e=Qp^bZ;(9W--^eduF21OW9+44d~7IAo6VNf^^`kpS*u(%@rD0Hdx0c~nb
zZlgr+Cx8A^dY|T#Ir=zt53}KF`4O;5sJvi&S!v<~HKyxO!=>q4Fn#`HB;SiPd0X_k
Lx`qq1P|N=Xzao$b

diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html
index 6685631..cd3d9b6 100644
--- a/standards/templates/standards/standards_add.html
+++ b/standards/templates/standards/standards_add.html
@@ -134,6 +134,27 @@
     </div>
   </div>
 </div>
+
+<!-- FILE FORBIDDEN DELETE FILE -->
+<div class="modal fade" id="forbiddenFileType" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="groupDelFunction" aria-hidden="true">
+  <div class="modal-dialog " role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLongTitle">Datei nicht erlaubt</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Schließen">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">        
+        Diesen Dateitypen dürfen Sie nicht hochladen.
+      </div>
+      <div class="modal-footer">        
+        <button type="button" class="btn btn-success" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <script type="text/javascript">
 //STANDARDS
 actualStandards = [];
diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index 8c1d5a5..16fad92 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -65,17 +65,15 @@
                         {% if standard.visibleby.all|length == 0 %}
                           {% setbool True %}  
                         {% endif %}
-
                         {% getbool as groupchecker %}
-
-
+                        
                         {% getvar as varcounter %}                        
                         {% if standard.task == task and standard.area == area and varcounter < 3 %}                                                  
                         {% incvar %}
                           {% if groupchecker %}
-                          <p class="card-text"><a href="{% url 'standard-single' standard.pk %}">{{standard.name|truncatechars:40}}</a></p>
+                          <p class="card-text"><a href="{% url 'standard-single' standard.pk %}">{{standard.name|truncatechars:28}}</a></p>
                           {% else %}                          
-                          <p class="card-text text-secondary"><i class="fas fa-lock"></i>&nbsp;{{standard.name|truncatechars:40}}</p>
+                          <p class="card-text text-secondary"><i class="fas fa-lock"></i>&nbsp;{{standard.name|truncatechars:28}}</p>
                           {% endif %}                          
                         {% endif %}                      
                     {% endfor %}                    
diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html
index 56fa28a..d59ecba 100644
--- a/standards/templates/standards/standards_update.html
+++ b/standards/templates/standards/standards_update.html
@@ -131,6 +131,27 @@
 	  	<a class="btn" href="{% url 'standards' %} ">Abbrechen</a>
   </form>
 </div>
+
+<!-- FILE FORBIDDEN DELETE FILE -->
+<div class="modal fade" id="forbiddenFileType" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="groupDelFunction" aria-hidden="true">
+  <div class="modal-dialog " role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLongTitle">Datei nicht erlaubt</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Schließen">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">        
+        Diesen Dateitypen dürfen Sie nicht hochladen.
+      </div>
+      <div class="modal-footer">        
+        <button type="button" class="btn btn-success" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <script type="text/javascript">
 //STANDARD
 function remStandard(sid, sname){
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 46b88aa8dd9f7cc106f62be25ef65173b46b364e..77865d72ec544fedcc4989a8d45e63f432c67067 100644
GIT binary patch
delta 324
zcmXAky-EX75QQ^0cX!S1&Te)$S^v-`5LgmOXJw@#h!C(4F`yuf2sVN~fQ1$TvCyeg
zq!kO_AXr;Td<-ALo8!P?=KDC!%+q<w$IM~P%?}@*f4uP7y?7VVW#c*)UxLTl1C1E8
zBn?mk3MB%ij+zn+Ka(U9!)0is(gfw8Oma|xet~{V3b+<r8?KbjGGrTa1#(r^;7Yi4
zVU1~r_H{@Tiu9LGDAPT2MWw!*Pu_6P+}XuTCL!19>a;$fj(*oiRB7M7(zed*7wzhk
q_eKZ0<&SBoGylfiZfY;6^fWlCjHS?Xu`Yi2e=j(9H`s0KV*UWrrABE0

delta 321
zcmW-cy-EX75JoebySwh)y?c}0P5cR1C`1LpLa?zDg*0ll1Of`eh#-hX9w3Dlf>`L(
z7PbK^A0Sv;NuI-ZaPkcdGv_d0F>^onu6E8gwC;`vmtU{$Vsf3_rW|tg*m$5(28wwJ
z<Uk2qP_E=T<?MynaSGSs{Hl#B&n=h&)aC+IB2yw$aS2z!b>O<ZxeVEXT!CEWHMlNZ
zk2A^WNY3e<68WPcc{vGgsFKg%+x7I7u~|G6<RoXbB_GW_+K}Joh_+?dywRb|%#Y@u
p!zm5qAbO%xnML=qANOfp>bTw^8yd1kJF?hyTbM!#MyJsZ{sFnlMQs28

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 39a8403..4141acc 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -6,6 +6,8 @@ register = template.Library()
 
 b = 0
 
+groupbool = False
+
 @register.simple_tag
 def setvar(value):
 	global b
@@ -26,11 +28,10 @@ def incvar():
 				
 @register.filter(name='has_group')
 def has_group(user, group_name):
-    group = Group.objects.get(name=group_name)
-    return True if group in user.groups.all() else False
+	group = Group.objects.get(name=group_name)
+	return True if group in user.groups.all() else False
 
 
-groupbool = False
 @register.simple_tag
 def setbool(value):
 	global groupbool
@@ -39,7 +40,7 @@ def setbool(value):
 
 @register.simple_tag
 def getbool():	
-	global groupbool
+	global groupbool	
 	return groupbool
 
 
diff --git a/standards/views.py b/standards/views.py
index 62da6ff..6ca29a7 100644
--- a/standards/views.py
+++ b/standards/views.py
@@ -181,19 +181,22 @@ def StandardUpdate(request, id):
 
 	allfiles = DataFile.objects.filter(agency=request.user.profile.agency)
 
-	for file in allfiles:
+	for file in allfiles:		
 		user_can_view_file = False
 		parentdir = DataDir.objects.get(pk=file.parent.pk)
-		if(parentdir.is_root == False):
-			for p_group in parentdir.visibleby.all():
+
+		if(parentdir.is_root == False and len(parentdir.visibleby.all()) > 0):			
+			for p_group in parentdir.visibleby.all():				
 				if p_group.group in request.user.groups.all():
-					user_can_view_file = True
+					user_can_view_file = True						
 		else:
 			user_can_view_file = True
+
+
+
 		# Check if file is in standard
-		if file not in standard.addedfiles.all():
-			if user_can_view_file:
-				possibleFilesByVisible.append(file)
+		if file not in standard.addedfiles.all() and user_can_view_file:			
+			possibleFilesByVisible.append(file)
 
 	possiblestandards = Standards.objects.filter(agency=request.user.profile.agency, public=True)
 	possiblestandards_final = []
@@ -336,10 +339,6 @@ def updatesbyajax(request, pk):
 			# ADD
 			elif(request.GET["action"] == "s_addstandard"):
 				workingstandard.linked_standards.add(Standards.objects.get(pk=request.GET["standardid"]))
-
-
-
-
 		else:
 			success = False			
 
diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc
index 31df121693084a7acea1abeea8912880037f606a..a40ce73f023310cf0b83addfa126482007d4580e 100644
GIT binary patch
delta 499
zcmbVJyGjHx6wS@NGn1KFU&~skrJb#%rC_0r2o_>-RW>UN&PJ=m#ocO!1=(#a^ali)
zzp)nl0YAVy<ARHJ22R4wIl1Q~`CJ>U%R?yzqv166PPSg<$m!=)g@k=VZvc!T*ibXW
zGz|Fz6t|iyN4bU}AA^mwXWSv6(_&U=zh(rw#Kb06feMR>0rWb&P&zU(`X*AM$uJ;<
z7>ym9nB*ybX280eq!fLUPHJg9lO}(qb?c-GgVM@x1FG`*_Ou@>iD{G3O0!LMhM7r?
z#Qc#Dxy?*iUnj=~E>v3bNt^wd92e<ewY5Z4;{r^E%eXT3DQCCJ*{R<G=R*F|@Ry(X
zF)Ul&J;ZPBWxJ;fkG^C2;$J~N-3X3?WB<B$R<x%#0cHn8G1uh@q(CS?f>RFX<*wLq
Q;I16WcL=rxh}9In0HdI9m;e9(

delta 482
zcmb`EJ5Izf5QaU@+p&{f9=kvR%@&-1nv#kR=nxVk5C*M8aD^Nqk%}TKq!dt4z!4z#
z-~iMd0eU7`KnPka+18A|ng6%ua^-DVZ7C%ft><)Oci~Z8IrXhj#RV{ikcWm@W}xKP
zkewT@9qn3%yn;M3UK<(Tx+S2q$k3&%utEnq%qAAlJLcJeiL5~1Mp_IR2DC$rDkqO^
zd>=nBVB=LH1(B1Ej6caj{zbdivNeJ#ms0_X<j?k$7g}L5WOUP+E0bbsm6h1L<0a1%
z8+KpmVIOB&mUO;poTa)}d9I+R{vp@|=W$T^<a0dr*~x#oB=o-of9W+NuY@@BXf7}A
w$<djqpZrru>rt>%m%+Z;Y$xWrTtWha<~`WsfX%j8cc5r))GGvQ0>n}RA5|u9cmMzZ

diff --git a/users/signals.py b/users/signals.py
index 1f448f4..db873e6 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -49,8 +49,9 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
 	GLOBALSENDMAILS = True
 	# GROUPSETTINGS FOR SOME USER WAS CHANGED
 	if isinstance(instance, Group):
-		group_touched = AgencyGroup.objects.get(group=instance)		
-		user_touched = User.objects.get(pk=list(pk_set)[0])		
+		group_touched = AgencyGroup.objects.get(group=instance)	
+		userid = list(pk_set)[0]	
+		user_touched = User.objects.get(pk=userid)		
 		
 		# PUSH NOTIFICATION FOR GROUOPCHANGES
 		if(user_touched.profile.add_new_group_push):
@@ -95,6 +96,7 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
 					    html_message=msg_html,
 					    fail_silently=False
 					)
+		
     
 # SIGNAL FOR NEWS
 @receiver(post_save, sender=News)
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 01fda29..9c97a17 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -26,9 +26,16 @@
   <link href='https://fonts.googleapis.com/css?family=Roboto&display=swap' rel='stylesheet' type='text/css'>
 
   <!-- include summernote css/js -->
-  <link href="https://cdn.jsdelivr.net/npm/summernote@0.8.15/dist/summernote.min.css" rel="stylesheet">
+  <!--<link href="https://cdn.jsdelivr.net/npm/summernote@0.8.15/dist/summernote.min.css" rel="stylesheet">
+  <script src="https://cdn.jsdelivr.net/npm/summernote@0.8.15/dist/summernote.min.js"></script>-->
+
+  {% if request.user_agent.browser.family == "IE" %}
+  <link href="https://cdn.jsdelivr.net/npm/summernote@0.8.12/dist/summernote.min.css" rel="stylesheet">
+  <script src="https://cdn.jsdelivr.net/npm/summernote@0.8.12/dist/summernote.min.js"></script>
+    {% else %}
+    <link href="https://cdn.jsdelivr.net/npm/summernote@0.8.15/dist/summernote.min.css" rel="stylesheet">
   <script src="https://cdn.jsdelivr.net/npm/summernote@0.8.15/dist/summernote.min.js"></script>
-  
+  {% endif %}
   
   <!-- CROPPER -->
   <link href="{% static 'users/css/cropper.min.css' %}" rel="stylesheet">