From 43331055ba42b4054ae5aca8f330c68c8929cb3e Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Fri, 25 Mar 2016 12:50:38 +0100 Subject: [PATCH] Fix #8 Cancel creation should also reset data --- app/js/controllers/init/create/RootBlockController.js | 7 +++++++ app/views/init/create/create_root.jade | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/js/controllers/init/create/RootBlockController.js b/app/js/controllers/init/create/RootBlockController.js index b52cddd..e2cb6ed 100644 --- a/app/js/controllers/init/create/RootBlockController.js +++ b/app/js/controllers/init/create/RootBlockController.js @@ -62,4 +62,11 @@ module.exports = ($scope, $http, $state, BMA) => { yield BMA.webmin.server.services.startAll(); $state.go('index'); }); + + $scope.cancelAndReset = () => co(function *() { + yield BMA.webmin.server.http.stop(); + yield BMA.webmin.server.services.stopAll(); + yield BMA.webmin.server.resetData(); + $state.go('index'); + }); }; diff --git a/app/views/init/create/create_root.jade b/app/views/init/create/create_root.jade index 42abced..1b7097e 100644 --- a/app/views/init/create/create_root.jade +++ b/app/views/init/create/create_root.jade @@ -35,6 +35,6 @@ span(translate="configuration.create_root.button.accept_and_send") .row .col.s12 - button.btn-large.orange.waves-effect.waves-light(ui-sref="index") + button.btn-large.orange.waves-effect.waves-light(ng-click="cancelAndReset()") i.left.fa.fa-sign-out span(translate="configuration.create_root.button.cancel") -- GitLab