Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/childschedule' into 'dev'

Browse Source 
Fix child schedule failing to load after del parent

See merge request crafty-controller/crafty-4!753
This commit is contained in:
Iain Powrie 2024-05-09 20:16:59 +00:00
commit 5bc1d74d13
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
TBD TBD
### Bug fixes ### Bug fixes
- Reset query arguments on login if `?next` is not available ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/750)) - Reset query arguments on login if `?next` is not available ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/750))
- Fix child schedule failing to load after del parent ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/753))
### Tweaks ### Tweaks
- Add link to go back to dashboard on error page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/743)) - Add link to go back to dashboard on error page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/743))
- Set audit logging to logfile instead of DB ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/751)) - Set audit logging to logfile instead of DB ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/751))

8
app/classes/web/panel_handler.py
View File

@ -1237,9 +1237,11 @@ class PanelHandler(BaseHandler):
page_data["schedule"]["interval_type"] = schedule.interval_type page_data["schedule"]["interval_type"] = schedule.interval_type
if schedule.interval_type == "reaction": if schedule.interval_type == "reaction":
difficulty = "reaction" difficulty = "reaction"
page_data["parent"] = self.controller.management.get_scheduled_task( page_data["parent"] = None
schedule.parent if schedule.parent:
) page_data["parent"] = self.controller.management.get_scheduled_task(
schedule.parent
)
elif schedule.cron_string == "": elif schedule.cron_string == "":
difficulty = "basic" difficulty = "basic"
page_data["parent"] = None page_data["parent"] = None