jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move uninstall confirm dialog to app page

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-13 11:18:43 +02:00
parent c4dfe8a723
commit 62fb0acb3c
4 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/views/apps.js
View File

@@ -286,38 +286,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
}
};
$scope.appUninstall = {
busy: false,
error: {},
app: {},
show: function (app) {
$scope.reset();
$scope.appUninstall.app = app;
$('#appUninstallModal').modal('show');
},
submit: function () {
$scope.appUninstall.busy = true;
Client.uninstallApp($scope.appUninstall.app.id, function (error) {
if (error && error.statusCode === 402) { // unpurchase failed
Client.error('Relogin to Cloudron App Store');
} else if (error) {
Client.error(error);
} else {
$('#appUninstallModal').modal('hide');
Client.refreshAppCache($scope.appUninstall.app.id); // reflect the new app state immediately
$scope.reset();
}
$scope.appUninstall.busy = false;
});
}
};
$scope.appClone = {
busy: false,
error: {},
@@ -592,7 +560,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$('#appRestoreModal').modal('hide');
$('#appUpdateModal').modal('hide');
$('#appInfoModal').modal('hide');
$('#appUninstallModal').modal('hide');
$('#appPostInstallConfirmModal').modal('hide');
// reset configure dialog
@@ -620,10 +587,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appConfigureForm.$setPristine();
$scope.appConfigureForm.$setUntouched();
// reset uninstall dialog
$scope.appUninstall.app = {};
$scope.appUninstall.error = {};
// reset update dialog
$scope.appUpdate.error = {};
$scope.appUpdate.app = {};
@@ -765,7 +728,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
});
// setup all the dialog focus handling
['appConfigureModal', 'appUninstallModal', 'appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
['appConfigureModal', 'appUpdateModal', 'appRestoreModal', 'appInfoModal', 'appErrorModal'].forEach(function (id) {
$('#' + id).on('shown.bs.modal', function () {
$(this).find("[autofocus]:first").focus();
});