Skip to content

Commit 32334e9

Browse files
author
HenryVisuri
committed
Skip non-editable (manually set) deadlines on update_deadlines
1 parent 7ea208e commit 32334e9

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

projects/models/project.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,10 @@ def _set_calculated_deadline(self, deadline, date, user, preview, preview_attrib
520520
preview_attribute_data = {}
521521
if confirmed_fields is None:
522522
confirmed_fields = {}
523-
523+
524524
if not date:
525525
return None
526+
526527
try:
527528
if preview:
528529
try:
@@ -571,9 +572,12 @@ def _set_calculated_deadline(self, deadline, date, user, preview, preview_attrib
571572
preview_attribute_data if preview else None,
572573
)
573574

574-
if preview or not project_deadline.editable:
575+
if preview:
575576
return enforced_date
576577

578+
if not project_deadline.editable:
579+
return None
580+
577581
if project_deadline.date != enforced_date:
578582
project_deadline.date = enforced_date
579583
project_deadline.save()

projects/serializers/section.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ def validate(value):
117117
vis_bool = get_dl_vis_bool_name(attr_dl.deadlinegroup)
118118
if vis_bool and preview.get(vis_bool) is False:
119119
continue
120+
121+
# Skip validation for deadlines that are not editable
122+
if attr_dl.editable is False:
123+
continue
124+
120125
# validate datetype
121126
try:
122127
assert attr_dl.date_type.is_valid_date(value)

0 commit comments

Comments
 (0)