From ed95d39b26dff2724875b16365dfbe36146577c0 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 10 May 2020 17:14:34 +0200
Subject: [PATCH] =?UTF-8?q?DEV=20F=C3=9CR=200.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4093 -> 4093 bytes
 .../templates/organizer/contacts_content.html |   4 +++-
 .../organizer/organizer_management.html       |   6 +++---
 .../organizer/passwords_content.html          |   9 +++++----
 .../organizer/quicklinks_content.html         |   4 +++-
 .../standards/standards_management.html       |   6 +++---
 .../standards/standards_single_agn.html       |   5 +----
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index a3abf1ab3b4b39ba26dab2d29b07ec0ecb9a7c85..ae6a441db8bfabf432b2e07f815861d25cac5944 100644
GIT binary patch
delta 19
Zcmew>|5u(Xl$V!_0SH2+HgbLD2LLt;1n2+&

delta 19
Zcmew>|5u(Xl$V!_0SLl)H*$UE2LLtD1l#}s

diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html
index 70c4d79..acb6bde 100644
--- a/organizer/templates/organizer/contacts_content.html
+++ b/organizer/templates/organizer/contacts_content.html
@@ -41,6 +41,7 @@
               <td>
                 {% if agc.category != None%} {{agc.category}} {% endif%}
               </td>
+              {% if user|usergperm:"moduleorganizer" %} 
               <td>
                 {% if user|usergperm:"moduleorganizer" %} 
                   <a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'cont-delete' agc.pk %}">
@@ -52,7 +53,8 @@
                   <i class="fas fa-pen"></i>
                   </small></a>
                   {% endif %}
-              </td>              
+              </td>  
+              {% endif %}            
           </tr>
         {% endfor %}   
         </tbody>  
diff --git a/organizer/templates/organizer/organizer_management.html b/organizer/templates/organizer/organizer_management.html
index 6e3097d..1912438 100644
--- a/organizer/templates/organizer/organizer_management.html
+++ b/organizer/templates/organizer/organizer_management.html
@@ -28,7 +28,7 @@
         <h5 class="mt-3">Quicklinks{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier Links auf andere Webseiten." class="far fa-question-circle"></i></small>{% endif %}
           {% if user|usergperm:"moduleorganizer" %} <span style="float: right; margin-top: -5px"><a class="btn btn-primary btn-sm" href="{% url 'ql-addql' %}"><i class="fas fa-plus"></i>&nbsp;Quicklink</a></span>{% endif %}
         </h5>
-        <hr>        
+        {% if user|usergperm:"moduleorganizer" %}<hr>{% endif %}        
         {% block quicklinks_content %}
            {% include "organizer/quicklinks_content.html" %}
         {% endblock %}        
@@ -42,7 +42,7 @@
         <a class="btn btn-primary btn-sm" href="{% url 'addcontact' %}"><i class="fas fa-plus"></i>&nbsp;Kontakt</a></span>      
         {% endif %}
         </h5>
-        <hr>
+        {% if user|usergperm:"moduleorganizer" %}<hr>{% endif %}      
         {% block contacts_content %}
            {% include "organizer/contacts_content.html" %}
         {% endblock %} 
@@ -54,7 +54,7 @@
           <span style="float: right; margin-top: -5px"><a class="btn btn-primary btn-sm" href="{% url 'add-agpass' %}"><i class="fas fa-plus"></i>&nbsp;Passwort</a></span>
         {% endif %} 
         </h5>
-        <hr>
+        {% if user|usergperm:"moduleorganizer" %}<hr>{% endif %}      
         {% block passwords_content %}
            {% include "organizer/passwords_content.html" %}
         {% endblock %} 
diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html
index ca3e954..b2d65d5 100644
--- a/organizer/templates/organizer/passwords_content.html
+++ b/organizer/templates/organizer/passwords_content.html
@@ -59,8 +59,8 @@
                 <a href="#\" onclick="javascript:copyPassToCB({{ap.pk}})"><i class="far fa-copy"></i></a>
                 <span id="pass_cl_cop_{{ap.pk}}" style="display: none;">Kopiert!</span>
               </td>
-              <td>
               {% if user|usergperm:"moduleorganizer" %} 
+              <td>              
                 <div class="dropdown no-arrow">
                   <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       <i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
@@ -71,14 +71,15 @@
                       <div class="dropdown-divider"></div>                  
                       <a class="dropdown-item text-danger" href="{% url 'pass-delete' ap.pk %}" >Löschen</a>
                     </div>
-                  </div>
-                  {% endif %}
+                  </div>                  
                 </div>
               </td>
+              {% endif %}
           </tr>
           {% else %}
           <tr><td id="pass_{{ap.pk}}" class="droppable_tr" data-toggle="popover" data-placement="top"  data-trigger="hover" title="Zugriffsbeschränkung" data-content="Zugriff beschränkt auf {% for passgroup in ap.visibleby.all %}{{passgroup.agencygroupname}}{% if forloop.counter < d.visibleby.all|length %}, {%endif%}{% endfor %}">
-          <span class="text-secondary"><i class="fas fa-lock"></i>&nbsp;{{ap.name}}</span></td><td></td><td></td><td></td><td></td></tr>
+          <span class="text-secondary"><i class="fas fa-lock"></i>&nbsp;{{ap.name}}</span></td><td></td><td></td><td></td>{% if user|usergperm:"moduleorganizer" %} <td></td>{% endif %}
+          </tr>
           {% endif %}
         {% endfor %}   
         </tbody>  
diff --git a/organizer/templates/organizer/quicklinks_content.html b/organizer/templates/organizer/quicklinks_content.html
index 062a322..95bb0d4 100644
--- a/organizer/templates/organizer/quicklinks_content.html
+++ b/organizer/templates/organizer/quicklinks_content.html
@@ -26,6 +26,7 @@
               <td>{{ql.name }}</td>
               <td><a href="{{ ql.link }}" target="_blank">{{ ql.link }}</a></td>              
               <!--<td><img src="{{ ql.get_photo_url }}" width="15%"></td>              -->
+              {% if user|usergperm:"moduleorganizer" %}
               <td>
               	{% if user|usergperm:"moduleorganizer" %} 
                 <a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'ql-delete' ql.pk%}">
@@ -38,7 +39,8 @@
                 </small></a>
                   {% endif %}
                 </div>
-              </td>              
+              </td> 
+              {% endif %}             
           </tr>
         {% endfor %}   
         </tbody>  
diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index 4579fb0..ba7eb26 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -141,12 +141,12 @@
                         <a class="dropdown-item" href="{% url 'standard-status' standard.pk %}">Veröffentlichung aufheben</a> 
                       {% else %}
                        {% if standard.area != None and standard.task != None %}
-                            <a class="dropdown-item" href="{% url 'standard-status' standard.pk %}">Veröffentlichen</a>
-                          {% endif %}
+                          <a class="dropdown-item" href="{% url 'standard-status' standard.pk %}">Veröffentlichen</a>
+                        {% endif %}
                       {% endif %}
                     {% endif %}
                     {% if standard.created_standard_by == request.user or perms.users.standardmanager %}
-                     <a class="dropdown-item" href="{% url 'standard-add' standard.pk %}">Bearbeiten</a>                     
+                     <a class="dropdown-item" href="{% url 'standard-add' standard.pk %}">Bearbeiten</a>                    
                     {% endif %}                                       
                     <div class="dropdown-divider"></div>       
                     <a class="dropdown-item text-danger" href="{% url 'standard-delete' standard.pk %}" >Löschen</a>
diff --git a/standards/templates/standards/standards_single_agn.html b/standards/templates/standards/standards_single_agn.html
index 0d6b2ef..d0fecbd 100644
--- a/standards/templates/standards/standards_single_agn.html
+++ b/standards/templates/standards/standards_single_agn.html
@@ -25,7 +25,7 @@
     </h2>
   <hr>
   <div class="row col">
-    {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.authority.count > 0 or  standard.executor.count > 0 or standard.representative.count > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %}
+    {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %}
     <div class="card col-9" style="min-height: 500px">  
     {% else %}
     <div class="card col-12" style="min-height: 500px">  
@@ -38,10 +38,7 @@
           </p>
       </div>
     </div>
-
     <div class="col-3">
-
-
     {% if standard.freefield_title|length > 0 %}
     <div class="card col-14 ml-1 mb-2" style="">  
       <div class="card-body">