zou 0.20.58__tar.gz → 0.20.59__tar.gz

{zou-0.20.58/zou.egg-info → zou-0.20.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.58
+Version: 0.20.59
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -49,13 +49,12 @@ Requires-Dist: Jinja2==3.1.6
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.36.0
-Requires-Dist: numpy==2.2.6; python_version == "3.10"
-Requires-Dist: numpy==2.3.1; python_version >= "3.11"
-Requires-Dist: opencv-python==4.11.0.86
+Requires-Dist: numpy==2.2.6
+Requires-Dist: opencv-python==4.12.0.88
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
 Requires-Dist: orjson==3.10.18
-Requires-Dist: pillow==11.2.1
+Requires-Dist: pillow==11.3.0
 Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.9
 Requires-Dist: pyotp==2.9.0
@@ -69,7 +68,7 @@ Requires-Dist: requests==2.32.4
 Requires-Dist: rq==2.4.0
 Requires-Dist: semver==3.0.4
 Requires-Dist: slackclient==2.9.4
-Requires-Dist: spdx-license-list==3.26.0
+Requires-Dist: spdx-license-list==3.27.0
 Requires-Dist: sqlalchemy_utils==0.41.2
 Requires-Dist: sqlalchemy==2.0.41
 Requires-Dist: tabulate==0.9.0

{zou-0.20.58 → zou-0.20.59}/setup.cfg

@@ -55,13 +55,12 @@ install_requires =
 	ldap3==2.9.1
 	matterhook==0.2
 	meilisearch==0.36.0
-	numpy==2.2.6; python_version == "3.10"
-	numpy==2.3.1; python_version >= "3.11"
-	opencv-python==4.11.0.86
+	numpy==2.2.6
+	opencv-python==4.12.0.88
 	OpenTimelineIO==0.17.0
 	OpenTimelineIO-Plugins==0.17.0
 	orjson==3.10.18
-	pillow==11.2.1
+	pillow==11.3.0
 	psutil==7.0.0
 	psycopg[binary]==3.2.9
 	pyotp==2.9.0
@@ -75,7 +74,7 @@ install_requires =
 	rq==2.4.0
 	semver==3.0.4
 	slackclient==2.9.4
-	spdx-license-list==3.26.0
+	spdx-license-list==3.27.0
 	sqlalchemy_utils==0.41.2
 	sqlalchemy==2.0.41
 	tabulate==0.9.0

zou-0.20.59/zou/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.20.59"

{zou-0.20.58 → zou-0.20.59}/zou/app/blueprints/crud/schedule_item.py

@@ -28,8 +28,8 @@ class ScheduleItemResource(BaseModelResource):
         BaseModelResource.__init__(self, ScheduleItem)
 
     def check_update_permissions(self, instance, data):
-        return user_service.check_supervisor_schedule_item_access(
-            instance, data
+        return user_service.check_supervisor_project_task_type_access(
+            instance["project_id"], instance["task_type_id"]
         )
 
     def update_data(self, data, instance_id):

{zou-0.20.58 → zou-0.20.59}/zou/app/blueprints/source/csv/task_type_estimations.py

@@ -9,12 +9,22 @@ from zou.app.services import (
     shots_service,
     tasks_service,
     persons_service,
+    user_service,
 )
 
 from zou.app.utils import date_helpers
 
 
 class TaskTypeEstimationsCsvImportResource(BaseCsvProjectImportResource):
+    """
+    Import the estimations of task-types for given project.
+    """
+
+    def check_permissions(self, project_id, task_type, episode_id=None):
+        return user_service.check_supervisor_project_task_type_access(
+            project_id, task_type["id"]
+        )
+
     def post(self, project_id, task_type_id, episode_id=None):
         """
         Import the estimations of task-types for given project.

{zou-0.20.58 → zou-0.20.59}/zou/app/services/user_service.py

@@ -519,8 +519,31 @@ def check_task_action_access(task_id):
                     ]
                     in user["departments"]
                 )
-    else:
-        is_allowed = False
+
+    if not is_allowed:
+        raise permissions.PermissionDenied
+    return is_allowed
+
+
+def check_supervisor_project_task_type_access(project_id, task_type_id):
+    """
+    Return true if current user can have access to a task type.
+    """
+    is_allowed = False
+    if permissions.has_admin_permissions() or (
+        permissions.has_manager_permissions()
+        and check_belong_to_project(project_id)
+    ):
+        is_allowed = True
+    elif permissions.has_supervisor_permissions() and check_belong_to_project(
+        project_id
+    ):
+        user = persons_service.get_current_user(relations=True)
+        is_allowed = (
+            user["departments"] == []
+            or tasks_service.get_task_type(task_type_id)["department_id"]
+            in user["departments"]
+        )
 
     if not is_allowed:
         raise permissions.PermissionDenied
@@ -664,38 +687,6 @@ def check_supervisor_task_access(task, new_data={}):
     return is_allowed
 
 
-def check_supervisor_schedule_item_access(schedule_item, new_data={}):
-    """
-    Return true if current user is a manager and has a task assigned related
-    to the project of this task or is a supervisor and can modify data accorded
-    to his departments
-    """
-    is_allowed = False
-    if permissions.has_admin_permissions() or (
-        permissions.has_manager_permissions()
-        and check_belong_to_project(schedule_item["project_id"])
-    ):
-        is_allowed = True
-    elif permissions.has_supervisor_permissions() and check_belong_to_project(
-        schedule_item["project_id"]
-    ):
-        user_departments = persons_service.get_current_user(relations=True)[
-            "departments"
-        ]
-        if (
-            user_departments == []
-            or tasks_service.get_task_type(schedule_item["task_type_id"])[
-                "department_id"
-            ]
-            in user_departments
-        ):
-            is_allowed = True
-
-    if not is_allowed:
-        raise permissions.PermissionDenied
-    return is_allowed
-
-
 def check_metadata_department_access(entity, new_data={}):
     """
     Return true if current user is a manager and has a task assigned for this

{zou-0.20.58 → zou-0.20.59/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.58
+Version: 0.20.59
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire
@@ -49,13 +49,12 @@ Requires-Dist: Jinja2==3.1.6
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: matterhook==0.2
 Requires-Dist: meilisearch==0.36.0
-Requires-Dist: numpy==2.2.6; python_version == "3.10"
-Requires-Dist: numpy==2.3.1; python_version >= "3.11"
-Requires-Dist: opencv-python==4.11.0.86
+Requires-Dist: numpy==2.2.6
+Requires-Dist: opencv-python==4.12.0.88
 Requires-Dist: OpenTimelineIO==0.17.0
 Requires-Dist: OpenTimelineIO-Plugins==0.17.0
 Requires-Dist: orjson==3.10.18
-Requires-Dist: pillow==11.2.1
+Requires-Dist: pillow==11.3.0
 Requires-Dist: psutil==7.0.0
 Requires-Dist: psycopg[binary]==3.2.9
 Requires-Dist: pyotp==2.9.0
@@ -69,7 +68,7 @@ Requires-Dist: requests==2.32.4
 Requires-Dist: rq==2.4.0
 Requires-Dist: semver==3.0.4
 Requires-Dist: slackclient==2.9.4
-Requires-Dist: spdx-license-list==3.26.0
+Requires-Dist: spdx-license-list==3.27.0
 Requires-Dist: sqlalchemy_utils==0.41.2
 Requires-Dist: sqlalchemy==2.0.41
 Requires-Dist: tabulate==0.9.0

{zou-0.20.58 → zou-0.20.59}/zou.egg-info/requires.txt

@@ -27,11 +27,12 @@ Jinja2==3.1.6
 ldap3==2.9.1
 matterhook==0.2
 meilisearch==0.36.0
-opencv-python==4.11.0.86
+numpy==2.2.6
+opencv-python==4.12.0.88
 OpenTimelineIO==0.17.0
 OpenTimelineIO-Plugins==0.17.0
 orjson==3.10.18
-pillow==11.2.1
+pillow==11.3.0
 psutil==7.0.0
 psycopg[binary]==3.2.9
 pyotp==2.9.0
@@ -45,7 +46,7 @@ requests==2.32.4
 rq==2.4.0
 semver==3.0.4
 slackclient==2.9.4
-spdx-license-list==3.26.0
+spdx-license-list==3.27.0
 sqlalchemy_utils==0.41.2
 sqlalchemy==2.0.41
 tabulate==0.9.0
@@ -53,12 +54,6 @@ tomlkit==0.13.3
 ua-parser==1.0.1
 werkzeug==3.1.3
 
-[:python_version == "3.10"]
-numpy==2.2.6
-
-[:python_version >= "3.11"]
-numpy==2.3.1
-
 [dev]
 wheel
 

zou-0.20.58/zou/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.20.58"