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

Fix sorting on schedules

Browse Source 
Fix deleting scheduled tasks that are disabled.
This commit is contained in:
Andrew 2022-01-13 00:30:35 -05:00
parent 77b65de09b
commit 362f16fec4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/classes/shared/tasks.py
View File

@ -198,8 +198,12 @@ class TasksManager:
logger.info("JOB: {}".format(item)) logger.info("JOB: {}".format(item))
def remove_job(self, sch_id): def remove_job(self, sch_id):
job = management_helper.get_scheduled_task_model(sch_id)
management_helper.delete_scheduled_task(sch_id) management_helper.delete_scheduled_task(sch_id)
self.scheduler.remove_job(str(sch_id)) if job.enabled:
self.scheduler.remove_job(str(sch_id))
else:
logger.info("Job with ID {} was deleted from DB, but was not enabled. Not going to try removing something that doesn't exist from active schedules.")
def update_job(self, sch_id, job_data): def update_job(self, sch_id, job_data):
management_helper.update_scheduled_task(sch_id, job_data) management_helper.update_scheduled_task(sch_id, job_data)

3
app/frontend/templates/panel/server_tasks.html
View File

@ -235,6 +235,7 @@ td {
$('[data-toggle="popover"]').popover(); $('[data-toggle="popover"]').popover();
if($(window).width() < 1000){ if($(window).width() < 1000){
$('.too_small').popover("show"); $('.too_small').popover("show");
document.getElementById('schedule_table_wrapper').hidden = true;
} }
}); });
@ -247,9 +248,11 @@ td {
// This will execute whenever the window is resized // This will execute whenever the window is resized
if($(window).width() < 1000){ if($(window).width() < 1000){
$('.too_small').popover("show"); $('.too_small').popover("show");
document.getElementById('schedule_table_wrapper').hidden = true;
} }
else{ else{
$('.too_small').popover("hide"); $('.too_small').popover("hide");
document.getElementById('schedule_table_wrapper').hidden = false;
} // New width } // New width
}); });
</script> </script>