yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-06 03:50:04 +02:00
Code Issues Releases Wiki Activity

Only install if enabled.

Browse source
This commit is contained in:
Gunther Brunner 2014-04-04 19:46:59 +09:00
parent 2e80900537
commit db11a59125
3 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
res/app/control-panes/dashboard/upload/upload-controller.js
View file

@ -2,6 +2,8 @@ module.exports = function UploadCtrl($scope, $rootScope, SettingsService, gettex
$scope.upload = null
$scope.installation = null
$scope.installEnabled = true
$scope.launchEnabled = true
$scope.clear = function () {
$scope.upload = null
@ -17,31 +19,33 @@ module.exports = function UploadCtrl($scope, $rootScope, SettingsService, gettex
var upload = $rootScope.control.upload($files)
$scope.installation = null
return upload.promise
.progressed(function(uploadResult) {
$scope.$apply(function() {
.progressed(function (uploadResult) {
$scope.$apply(function () {
$scope.upload = uploadResult
})
})
.then(function(uploadResult) {
$scope.$apply(function() {
.then(function (uploadResult) {
$scope.$apply(function () {
$scope.upload = uploadResult
})
if (uploadResult.success) {
var install = $rootScope.control.install(uploadResult.body)
return install.promise
.progressed(function(installResult) {
$scope.$apply(function() {
installResult.manifest = uploadResult.body.manifest
$scope.installation = installResult
if ($scope.installEnabled) {
var install = $rootScope.control.install(uploadResult.body)
return install.promise
.progressed(function (installResult) {
$scope.$apply(function () {
installResult.manifest = uploadResult.body.manifest
$scope.installation = installResult
})
})
})
.then(function(installResult) {
$scope.$apply(function() {
installResult.manifest = uploadResult.body.manifest
$scope.treeData = installResult.manifest
$scope.installation = installResult
.then(function (installResult) {
$scope.$apply(function () {
installResult.manifest = uploadResult.body.manifest
$scope.treeData = installResult.manifest
$scope.installation = installResult
})
})
})
}
}
})
}