修复20210122定时无法取消bug

Author: AragonSnow

web/handlers/task.py

@@ -274,33 +274,41 @@ def get(self, taskid):
 
     @tornado.web.authenticated
     def post(self, taskid):
+        log = u'设置成功'
         try:
             envs = self.request.body_arguments
             for env in envs.keys():
                 if (envs[env][0] == u'true' or envs[env][0] == u'false'):
                     envs[env] = True if envs[env][0] == u'true' else False
                 else:
                     envs[env] = u'{0}'.format(envs[env][0])
-            c = cal()
-            if ('time' in envs):
-                if (len(envs['time'].split(':')) < 3):
-                    envs['time'] = envs['time'] + ':00'
-                    
-            tmp = c.calNextTs(envs)
-            if (tmp['r'] == 'True'):
-                self.db.task.mod(taskid,
-                    disabled = False,
-                    newontime = json.dumps(envs),
-                    next = tmp['ts'])
+
+            if (envs['sw']):
+                c = cal()
+                if ('time' in envs):
+                    if (len(envs['time'].split(':')) < 3):
+                        envs['time'] = envs['time'] + ':00'
+                tmp = c.calNextTs(envs)
+                if (tmp['r'] == 'True'):
+                    self.db.task.mod(taskid,
+                        disabled = False,
+                        newontime = json.dumps(envs),
+                        next = tmp['ts'])
+
+                    log = u'设置成功，下次执行时间：{0}'.format(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(tmp['ts'])))
+                else:
+                    raise Exception(tmp)
             else:
-                raise Exception(tmp)
-  
+                tmp = json.loads(self.db.task.get(taskid, fields=('newontime'))['newontime'])
+                tmp['sw'] = False
+                self.db.task.mod(taskid, newontime = json.dumps(tmp))
+
         except Exception:
             traceback.print_exc()
             self.render('utils_run_result.html', log=traceback.format_exc(), title=u'设置失败', flg='danger')
             return
 
-        self.render('utils_run_result.html', log=u'设置成功，下次执行时间：{0}'.format(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(tmp['ts']))), title=u'设置成功', flg='success')
+        self.render('utils_run_result.html', log=log, title=u'设置成功', flg='success')
         return
 
 class TaskGroupHandler(TaskNewHandler):

web/tpl/task_setTime.html

@@ -55,37 +55,38 @@ <h2 class="text-center">设置定时</h2>
   </script>
   <script>
     $('#send').on('click', function() {
-      if ($('#ontime_flg')[0].checked == false){
-        $('#run-result').html("<h1 class=\"alert alert-danger text-center\">请打开开关</h1><div><pre>如果要设置，请打开开关</pre></div>").show();
-        return false;
-      }
-
       sendData = {}
       data = {}
-      sendData['mode'] = $('#ontime_method')[0].value;
-      sendData['sw'] = true;
-      if (sendData['mode'] == 'ontime'){
-        sendData['date'] = $('#ontime_run_date')[0].value;
-        sendData['time'] = $('#ontime_val')[0].value;
-        sendData['tz1'] = parseInt($('#randtimezone1')[0].value);
-        sendData['tz2'] = parseInt($('#randtimezone2')[0].value);
-        if ($('#randtimezonesw')[0].checked == true){
-          if (sendData['tz1'] > sendData['tz2']){
-              $('#run-result').html("<h1 class=\"alert alert-danger text-center\">随机值错误</h1><div><pre>开启随机时tz1 不能小于 tz2</pre></div>").show();
-              return false;
+
+      if ($('#ontime_flg')[0].checked == true){
+        sendData['mode'] = $('#ontime_method')[0].value;
+        sendData['sw'] = true;
+        if (sendData['mode'] == 'ontime'){
+          sendData['date'] = $('#ontime_run_date')[0].value;
+          sendData['time'] = $('#ontime_val')[0].value;
+          sendData['tz1'] = parseInt($('#randtimezone1')[0].value);
+          sendData['tz2'] = parseInt($('#randtimezone2')[0].value);
+          if ($('#randtimezonesw')[0].checked == true){
+            if (sendData['tz1'] > sendData['tz2']){
+                $('#run-result').html("<h1 class=\"alert alert-danger text-center\">随机值错误</h1><div><pre>开启随机时tz1 不能小于 tz2</pre></div>").show();
+                return false;
+            }
+            sendData['randsw'] = true;
+          }else{
+            sendData['randsw'] = false;
           }
-          sendData['randsw'] = true;
-        }else{
-          sendData['randsw'] = false;
-        }
 
-      } else if (sendData['mode'] == 'cron'){
-        sendData['cron_val'] = $('#cron_val')[0].value;
-        sendData['cron_sec'] = $('#cron_sec')[0].value;
-      } else{
-        $('#run-result').html("<h1 class=\"alert alert-danger text-center\">模式错误</h1><div><pre>模式错误</pre></div>").show();
-        return false;
+        } else if (sendData['mode'] == 'cron'){
+          sendData['cron_val'] = $('#cron_val')[0].value;
+          sendData['cron_sec'] = $('#cron_sec')[0].value;
+        } else{
+          $('#run-result').html("<h1 class=\"alert alert-danger text-center\">模式错误</h1><div><pre>模式错误</pre></div>").show();
+          return false;
+        }
+      } else {
+        sendData['sw'] = false;
       }
+
       var $this = $(this);
       $.ajax("/task/{{task.id}}/settime", {
             type: 'POST',