diff --git a/meteor/client/lib/apputil.js b/meteor/client/lib/apputil.js index 12845487fc..058b0401f4 100644 --- a/meteor/client/lib/apputil.js +++ b/meteor/client/lib/apputil.js @@ -101,8 +101,8 @@ AppUtil.restart = function (appId) { AppUtil.remove = function (appId) { var app = Apps.findOne(appId); + Apps.remove({_id: appId}); if (app.docker) { - Apps.remove({_id: appId}); Docker.removeContainer(app.docker.Id, function (err) { if (err) { console.error(err); } var appPath = path.join(Util.KITE_PATH, app.name); diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html index f9f86d0acf..baa2df2470 100755 --- a/meteor/client/views/dashboard/apps/dashboard-single-app.html +++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html @@ -22,11 +22,7 @@ {{image.meta.name}}
- {{#if $eq status 'STOPPED'}} - - {{/if}} {{#if $eq status 'READY'}} - {{#if url}} {{/if}} diff --git a/meteor/client/views/dashboard/components/modal-create-app.js b/meteor/client/views/dashboard/components/modal-create-app.js index b450b79c2d..a5656cb6e6 100755 --- a/meteor/client/views/dashboard/components/modal-create-app.js +++ b/meteor/client/views/dashboard/components/modal-create-app.js @@ -14,7 +14,7 @@ Template.modal_create_app.events({ var validationResult = formValidate(formData, FormSchema.formCreateApp); if (validationResult.errors) { clearFormErrors($form); - showFormErrors($form, validationResult.errors.details); + showFormErrors($form, validationResult.errors); } else { clearFormErrors($form); var cleaned = validationResult.cleaned;