zou 0.20.27__tar.gz → 0.20.29__tar.gz

{zou-0.20.27/zou.egg-info → zou-0.20.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.27
+Version: 0.20.29
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

zou-0.20.29/zou/__init__.py

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

{zou-0.20.27 → zou-0.20.29}/zou/app/blueprints/persons/resources.py

@@ -537,7 +537,7 @@ class PersonQuotaMixin(ArgsMixin):
     def get_quota_arguments(self):
         project_id = self.get_project_id()
         task_type_id = self.get_task_type_id()
-        count_mode = self.get_text_parameter("count_mode", default="weigthed")
+        count_mode = self.get_text_parameter("count_mode", default="weighted")
         if count_mode not in ["weighted", "weighteddone", "feedback", "done"]:
             raise WrongParameterException(
                 "count_mode must be equal to weighted, weigtheddone, feedback"
@@ -558,7 +558,7 @@ class PersonQuotaMixin(ArgsMixin):
         pass
 
     @jwt_required()
-    def get(self, person_id, **kwargs):
+    def get(self, person_id, *args, **kwargs):
         user_service.check_person_is_not_bot(person_id)
         (project_id, task_type_id, feedback, weighted) = (
             self.get_quota_arguments()
@@ -568,6 +568,7 @@ class PersonQuotaMixin(ArgsMixin):
         try:
             return self.get_person_quotas(
                 person_id,
+                *args,
                 **kwargs,
                 project_id=project_id,
                 task_type_id=task_type_id,
@@ -626,7 +627,7 @@ class PersonMonthQuotaShotsResource(Resource, PersonQuotaMixin):
             404:
                 description: Wrong date format
         """
-        super().get(person_id, year, month)
+        return super().get(person_id, year, month)
 
 
 class PersonWeekQuotaShotsResource(Resource, PersonQuotaMixin):
@@ -677,7 +678,7 @@ class PersonWeekQuotaShotsResource(Resource, PersonQuotaMixin):
             404:
                 description: Wrong date format
         """
-        super().get(person_id, year, week)
+        return super().get(person_id, year, week)
 
 
 class PersonDayQuotaShotsResource(Resource, PersonQuotaMixin):
@@ -735,7 +736,7 @@ class PersonDayQuotaShotsResource(Resource, PersonQuotaMixin):
             404:
                 description: Wrong date format
         """
-        super().get(person_id, year, month, day)
+        return super().get(person_id, year, month, day)
 
 
 class TimeSpentDurationResource(Resource, ArgsMixin):

{zou-0.20.27 → zou-0.20.29}/zou/app/blueprints/shots/resources.py

@@ -1646,7 +1646,13 @@ class ProjectPersonQuotasResource(Resource, ArgsMixin):
                 description: Quotas statistics for shots
         """
         projects_service.get_project(project_id)
-        user_service.check_project_access(project_id)
+        if (
+            permissions.has_manager_permissions()
+            or permissions.has_supervisor_permissions()
+        ):
+            user_service.check_project_access(project_id)
+        else:
+            user_service.check_person_access(person_id)
         args = self.get_args(
             [
                 ("count_mode", "weighted", False, str),

{zou-0.20.27 → zou-0.20.29}/zou/app/services/shots_service.py

@@ -1508,7 +1508,6 @@ def get_day_quota_shots(
     person and day.
     """
     start, end = date_helpers.get_day_interval(year, month, day)
-    # start, end = _get_timezoned_interval(start, end)
     if weighted:
         return get_weighted_quota_shots_between(
             person_id,

{zou-0.20.27 → zou-0.20.29}/zou/app/services/user_service.py

@@ -419,7 +419,7 @@ def check_belong_to_project(project_id):
 
 def has_project_access(project_id):
     """
-    Return true if current user is a manager or has a task assigned for this
+    Return true if current user is an admin or has a task assigned for this
     project.
     """
     return permissions.has_admin_permissions() or check_belong_to_project(

{zou-0.20.27 → zou-0.20.29/zou.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.27
+Version: 0.20.29
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

zou-0.20.27/zou/__init__.py

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