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

Fix installation from file upload.

Browse source
This commit is contained in:
Simo Kinnunen 2014-04-07 11:51:57 +09:00
parent a9641f3271
commit be0510b93a
3 changed files with 80 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,13 +10,13 @@ module.exports = function UploadCtrl($scope, $rootScope, SettingsService, gettex
$scope.installation = null
}
$rootScope.install = function ($files) {
$rootScope.installUrl = function (url) {
$scope.upload = {
progress: 0,
lastData: 'uploading'
}
var upload = $rootScope.control.upload($files)
var upload = $rootScope.control.uploadUrl(url)
$scope.installation = null
return upload.promise
.progressed(function (uploadResult) {
@ -29,27 +29,48 @@ module.exports = function UploadCtrl($scope, $rootScope, SettingsService, gettex
$scope.upload = uploadResult
})
if (uploadResult.success) {
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
})
})
}
return $scope.maybeInstall(uploadResult.body)
}
})
}
$rootScope.installFile = function ($files) {
$scope.upload = {
progress: 0,
lastData: 'uploading'
}
var upload = $rootScope.control.uploadFile($files)
$scope.installation = null
return upload.promise
.then(function (uploadResult) {
$scope.upload = uploadResult
if (uploadResult.success) {
return $scope.maybeInstall(uploadResult.body)
}
})
}
$scope.maybeInstall = function (options) {
if ($scope.installEnabled) {
var install = $rootScope.control.install(options)
return install.promise
.progressed(function (installResult) {
$scope.$apply(function () {
installResult.manifest = options.manifest
$scope.installation = installResult
})
})
.then(function (installResult) {
$scope.$apply(function () {
installResult.manifest = options.manifest
$scope.treeData = installResult.manifest
$scope.installation = installResult
})
})
}
}
$scope.uninstall = function (packageName) {
var tx = $rootScope.control.uninstall(packageName)
return tx.promise.then(function (result) {