diff options
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 14 | ||||
| -rw-r--r-- | modules/server_add/js/server_add.js | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index 8c99af24..45c81519 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -135,12 +135,12 @@ class Server_Add_Controller extends Controller { } } - public function finish($id, $task_id, $cancelled=false) { + public function finish($id, $task_id) { access::verify_csrf(); $task = ORM::factory("task", $task_id); - if (!$task->done && $cancelled) { + if (!$task->done) { message::warning(t("Add from server was cancelled prior to completion")); } @@ -148,6 +148,16 @@ class Server_Add_Controller extends Controller { print json_encode(array("result" => "success")); } + public function pause($id, $task_id) { + access::verify_csrf(); + + $task = ORM::factory("task", $task_id); + + message::warning(t("Add from server was cancelled prior to completion")); + batch::stop(); + print json_encode(array("result" => "success")); + } + private function _get_children($path) { $directory_list = $file_list = array(); $files = new DirectoryIterator($path); diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js index 570f3946..2fb50ee5 100644 --- a/modules/server_add/js/server_add.js +++ b/modules/server_add/js/server_add.js @@ -23,7 +23,7 @@ function init_server_add_form() { }, dataType: "json", type: "POST", - url: get_url("server_add/finish", task.id + "/true") + url: get_url("server_add/pause", task.id) }); } }); |