Skip to content

Commit 2ee0c2d

Browse files
Merge pull request #1005 from mxatmx/0.2
feat: enable all entities for schedule display #1004
2 parents 2af9e9e + 0f42815 commit 2ee0c2d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

zou/app/blueprints/crud/task_type.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from flask_jwt_extended import jwt_required
22

33
from zou.app.models.task_type import TaskType
4+
from zou.app.models.schedule_item import ScheduleItem
45
from zou.app.services.exception import WrongParameterException
56
from zou.app.services import tasks_service
67

@@ -317,6 +318,15 @@ def delete(self, instance_id):
317318
"""
318319
return super().delete(instance_id)
319320

321+
def pre_delete(self, instance_dict):
322+
"""
323+
Delete related ScheduleItems before deleting the TaskType.
324+
This runs AFTER check_delete_permissions, preventing foreign key
325+
constraint violations while maintaining security.
326+
"""
327+
ScheduleItem.query.filter_by(task_type_id=instance_dict["id"]).delete()
328+
return instance_dict
329+
320330
def update_data(self, data, instance_id):
321331
data = super().update_data(data, instance_id)
322332
name = data.get("name", None)

zou/app/services/schedule_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def get_task_types_schedule_items(project_id):
5555
task_types = [
5656
task_type
5757
for task_type in task_types
58-
if task_type["for_entity"] in ["Asset", "Shot"]
58+
if task_type["for_entity"] in ["Asset", "Shot", "Sequence", "Episode", "Edit"]
5959
]
6060
task_type_map = base_service.get_model_map_from_array(task_types)
6161
schedule_items = set(

0 commit comments

Comments
 (0)