Fixed app not deleting and form validation not working bug.

This commit is contained in:
Sean Li 2014-09-10 23:41:17 -07:00
parent 492efafb09
commit 228db73ca0
3 changed files with 2 additions and 6 deletions

View File

@ -101,8 +101,8 @@ AppUtil.restart = function (appId) {
AppUtil.remove = function (appId) { AppUtil.remove = function (appId) {
var app = Apps.findOne(appId); var app = Apps.findOne(appId);
Apps.remove({_id: appId});
if (app.docker) { if (app.docker) {
Apps.remove({_id: appId});
Docker.removeContainer(app.docker.Id, function (err) { Docker.removeContainer(app.docker.Id, function (err) {
if (err) { console.error(err); } if (err) { console.error(err); }
var appPath = path.join(Util.KITE_PATH, app.name); var appPath = path.join(Util.KITE_PATH, app.name);

View File

@ -22,11 +22,7 @@
<small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small> <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{image.meta.name}}</a></small>
</h5> </h5>
<div class="options"> <div class="options">
{{#if $eq status 'STOPPED'}}
<a href="#" onclick="trackLink('start app')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start App"><span class="typcn typcn-media-play-outline"></span></a>
{{/if}}
{{#if $eq status 'READY'}} {{#if $eq status 'READY'}}
<a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-stop"></span></a>
{{#if url}} {{#if url}}
<a href="{{url}}" onclick="trackLink('view app')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App"><span class="typcn typcn-eye-outline"></span></a> <a href="{{url}}" onclick="trackLink('view app')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App"><span class="typcn typcn-eye-outline"></span></a>
{{/if}} {{/if}}

View File

@ -14,7 +14,7 @@ Template.modal_create_app.events({
var validationResult = formValidate(formData, FormSchema.formCreateApp); var validationResult = formValidate(formData, FormSchema.formCreateApp);
if (validationResult.errors) { if (validationResult.errors) {
clearFormErrors($form); clearFormErrors($form);
showFormErrors($form, validationResult.errors.details); showFormErrors($form, validationResult.errors);
} else { } else {
clearFormErrors($form); clearFormErrors($form);
var cleaned = validationResult.cleaned; var cleaned = validationResult.cleaned;