From bb685b14fe23429aaf1ba7ba3f81e3a3add4767b Mon Sep 17 00:00:00 2001
From: SvyatoslavArtymovych <svyatoslav.artymovych@gmail.com>
Date: Thu, 1 Jun 2023 15:05:01 +0300
Subject: [PATCH] fix interpretation approve

---
 app/controllers/require_permission.py         |  7 ++---
 app/templates/book/collection_view.html       |  3 +-
 .../sub_collection_tab_content.html           | 29 ++++++++++++-------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/controllers/require_permission.py b/app/controllers/require_permission.py
index 4e3d569..435df99 100644
--- a/app/controllers/require_permission.py
+++ b/app/controllers/require_permission.py
@@ -46,9 +46,8 @@ def check_permissions(
     if not entity or not entity.access_groups:
         log(
             log.INFO,
-            "User [%s] dont have permission to [%s] [%s]",
+            "Entity [%s] of entity.access_groups [%s] not found",
             access,
-            current_user,
             entity,
         )
         flash("You do not have permission", "warning")
@@ -91,7 +90,7 @@ def check_permissions(
         log(
             log.INFO,
             "User [%s] has permission to [%s] [%s]",
-            access.name,
+            access,
             current_user,
             entity,
         )
@@ -100,8 +99,8 @@ def check_permissions(
     log(
         log.INFO,
         "User [%s] dont have permission to [%s] [%s]",
-        access.name,
         current_user,
+        access,
         entity,
     )
     flash("You do not have permission", "danger")
diff --git a/app/templates/book/collection_view.html b/app/templates/book/collection_view.html
index b276a76..aae1078 100644
--- a/app/templates/book/collection_view.html
+++ b/app/templates/book/collection_view.html
@@ -66,6 +66,7 @@
         {% set access_to_create_collections = has_permission(collection, Access.C) %}
         {% set access_to_update_collections = has_permission(collection, Access.U) %}
         {% set access_to_delete_collections = has_permission(collection, Access.D) %}
+        {% set access_to_create_section = has_permission(collection, Access.C, EntityType.SECTION) %}
 
         {% if access_to_create_collections or access_to_update_collections %}
           <ul class="py-2 text-sm text-gray-700 dark:text-gray-200">
@@ -79,7 +80,7 @@
                 </li>
               {% endif %}
             {% endif %}
-            {% if access_to_update_collections %}
+            {% if access_to_create_section %}
               {% if collection.children|length ==0  or collection.children|length ==0 and collection.is_leaf %}
                 <li>
                     <button type="button" id="callAddSectionModal" data-modal-target="add-section-modal" data-modal-toggle="add-section-modal" data-collection-id="{{collection.id}}" data-sub-collection-id="_"  class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">New Section</button>
diff --git a/app/templates/book/components/sub_collection_tab_content.html b/app/templates/book/components/sub_collection_tab_content.html
index c0ead64..7251a95 100644
--- a/app/templates/book/components/sub_collection_tab_content.html
+++ b/app/templates/book/components/sub_collection_tab_content.html
@@ -34,24 +34,31 @@
         {% set access_to_create_collections = has_permission(sub_collection, Access.C) %}
         {% set access_to_update_collections = has_permission(sub_collection, Access.U) %}
         {% set access_to_delete_collections = has_permission(sub_collection, Access.D) %}
+        {% set access_to_create_section = has_permission(collection, Access.C, EntityType.SECTION) %}
 
-        {% if access_to_create_collections or access_to_update_collections %}
+        {% if access_to_create_collections or access_to_update_collections or access_to_create_section %}
           <ul class="py-2 text-sm text-gray-700 dark:text-gray-200">
-            {% if sub_collection.is_leaf and not sub_collection.children %}
+            {% if access_to_create_section and sub_collection.is_leaf and not sub_collection.children %}
               <li>
                 <button type="button" id="callAddSectionModal" data-modal-target="add-section-modal" data-modal-toggle="add-section-modal" data-collection-id="{{collection.id}}" data-sub-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Section </button>
               </li>
             {% elif not sub_collection.is_leaf and not sub_collection.children %}
-              <li>
-                <button type="button" id="callAddSectionModal" data-modal-target="add-section-modal" data-modal-toggle="add-section-modal" data-collection-id="{{collection.id}}" data-sub-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Section </button>
-              </li>
-              <li>
-                <button type="button" id="callAddSubCollectionModal" data-modal-target="add-sub-collection-modal" data-modal-toggle="add-sub-collection-modal" data-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Subcollection </button>
-              </li>
+              {% if access_to_create_section %}
+                <li>
+                  <button type="button" id="callAddSectionModal" data-modal-target="add-section-modal" data-modal-toggle="add-section-modal" data-collection-id="{{collection.id}}" data-sub-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Section </button>
+                </li>
+              {% endif %}
+              {% if access_to_create_collections %}
+                <li>
+                  <button type="button" id="callAddSubCollectionModal" data-modal-target="add-sub-collection-modal" data-modal-toggle="add-sub-collection-modal" data-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Subcollection </button>
+                </li>
+              {% endif %}
             {% else %}
-              <li>
-                <button type="button" id="callAddSubCollectionModal" data-modal-target="add-sub-collection-modal" data-modal-toggle="add-sub-collection-modal" data-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Subcollection </button>
-              </li>
+              {% if access_to_create_collections %}
+                <li>
+                  <button type="button" id="callAddSubCollectionModal" data-modal-target="add-sub-collection-modal" data-modal-toggle="add-sub-collection-modal" data-collection-id="{{sub_collection.id}}" class="w-full block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"> New Subcollection </button>
+                </li>
+              {% endif %}
             {% endif %}
           </ul>
         {% endif %}