From 362f16fec441932dd513dbe71dbf428ff3a3f888 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 13 Jan 2022 00:30:35 -0500
Subject: [PATCH] Fix sorting on schedules Fix deleting scheduled tasks that
 are disabled.

---
 app/classes/shared/tasks.py                    | 6 +++++-
 app/frontend/templates/panel/server_tasks.html | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 45913a34..186bb5af 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -198,8 +198,12 @@ class TasksManager:
                 logger.info("JOB: {}".format(item))
 
     def remove_job(self, sch_id):
+        job = management_helper.get_scheduled_task_model(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):
         management_helper.update_scheduled_task(sch_id, job_data)
diff --git a/app/frontend/templates/panel/server_tasks.html b/app/frontend/templates/panel/server_tasks.html
index 89983d01..836b246b 100644
--- a/app/frontend/templates/panel/server_tasks.html
+++ b/app/frontend/templates/panel/server_tasks.html
@@ -235,6 +235,7 @@ td {
     $('[data-toggle="popover"]').popover();
       if($(window).width() < 1000){
       $('.too_small').popover("show");
+      document.getElementById('schedule_table_wrapper').hidden = true;
     }
   
   });
@@ -247,9 +248,11 @@ td {
     // This will execute whenever the window is resized
     if($(window).width() < 1000){
       $('.too_small').popover("show");
+      document.getElementById('schedule_table_wrapper').hidden = true;
     }
     else{
       $('.too_small').popover("hide");
+      document.getElementById('schedule_table_wrapper').hidden = false;
     } // New width
   });
   </script>