fix build

fekimoda · Apr 12, 2020 · 687b166 · 687b166
1 parent 8d95aa4
commit 687b166
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/eNMS/models/scheduling.py b/eNMS/models/scheduling.py
@@ -6,7 +6,6 @@
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship
 
-from eNMS import app
 from eNMS.database import db
 from eNMS.models.base import AbstractBase
 from eNMS.setup import scheduler

diff --git a/eNMS/static/js/automation.js b/eNMS/static/js/automation.js
@@ -449,12 +449,11 @@ function exportService(id) {
 }
 
 function taskAction(mode, id) {
-
   call({
     url: `/task_action/${mode}/${id}`,
     callback: function (result) {
       const inverseAction = mode == "resume" ? "pause" : "resume";
-      const action = `eNMS.automation.${inverseAction}Task('${id}')`
+      const action = `eNMS.automation.${inverseAction}Task('${id}')`;
       $(`#pause-resume-${id}`).attr("onclick", action);
       notify(result.response, "success", 5);
     },

diff --git a/eNMS/static/js/table.js b/eNMS/static/js/table.js
@@ -903,13 +903,17 @@ tables.task = class TaskTable extends Table {
         </li>
         <li>
           <button type="button" class="btn btn-sm btn-success ${state[0]}" ${state[0]}
-          onclick="eNMS.automation.taskAction('resume', '${row.id}')" data-tooltip="Play"
+          onclick="eNMS.automation.taskAction('resume', '${
+            row.id
+          }')" data-tooltip="Play"
             ><span class="glyphicon glyphicon-play"></span
           ></button>
         </li>
         <li>
           <button type="button" class="btn btn-sm btn-danger ${state[1]}" ${state[1]}
-          onclick="eNMS.automation.taskAction('pause', '${row.id}')" data-tooltip="Pause"
+          onclick="eNMS.automation.taskAction('pause', '${
+            row.id
+          }')" data-tooltip="Pause"
             ><span class="glyphicon glyphicon-pause"></span
           ></button>
         </li>

diff --git a/scheduler/scheduler.py b/scheduler/scheduler.py
@@ -68,14 +68,13 @@ async def schedule(request):
             if data["mode"] in ("resume", "schedule"):
                 result = self.schedule_task(data["task"])
                 if not result:
-                    return JSONResponse({"alert": f"Cannot schedule in the past."})
+                    return JSONResponse({"alert": "Cannot schedule in the past."})
                 else:
-                    response = f"Task {data['mode']}d."
-                    return JSONResponse({"response": response, "active": True})
+                    return JSONResponse({"response": "Task resumed.", "active": True})
             else:
                 try:
                     self.scheduler.pause_job(data["task"]["id"])
-                    return JSONResponse({"response": f"Task {data['mode']}d.",})
+                    return JSONResponse({"response": "Task paused."})
                 except JobLookupError:
                     return JSONResponse({"alert": "There is no such job scheduled."})