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

Use new subscription setup flow for app install dialog

Browse Source
This commit is contained in:
Johannes Zellner
2020-02-21 14:07:46 +01:00
parent 81fb4ab435
commit 52d454276d
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/appstore.js
+8 -10
View File
@@ -42,7 +42,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.appInstall = {
busy: false,
state: 'appInfo',
subscriptionHelperPage: '',
error: {},
app: {},
needsOverwrite: false,
@@ -73,7 +72,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.appInstall.domain = null;
$scope.appInstall.portBindings = {};
$scope.appInstall.state = 'appInfo';
$scope.appInstall.subscriptionHelperPage = '';
$scope.appInstall.mediaLinks = [];
$scope.appInstall.certificateFile = null;
$scope.appInstall.certificateFileName = '';
@@ -220,14 +218,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$('#collapseResourceConstraint').collapse('hide');
$('#collapseInstallForm').collapse('hide');
$('#collapseSubscriptionRequired').collapse('show');
if (error.message.indexOf('Upgrade to the premium') === 0) {
$scope.appInstall.subscriptionHelperPage = 'app_install_premium_subscription_required.html';
} else if (error.message.indexOf('The subscription for this Cloudron has expired.') === 0) {
$scope.appInstall.subscriptionHelperPage = 'app_install_subscription_expired.html';
} else {
$scope.appInstall.subscriptionHelperPage = 'app_install_subscription_required.html';
}
} else if (error.statusCode === 409) {
if (error.portName) {
$scope.appInstall.error.port = error.message;
@@ -455,6 +445,14 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
});
};
$scope.openSubscriptionSetup = function () {
Client.getSubscription(function (error, subscription) {
if (error) return console.error('Unable to get subscription.', error);
Client.openSubscriptionSetup(subscription);
});
};
document.getElementById('appInstallCertificateFileInput').onchange = function (event) {
$scope.$apply(function () {
$scope.appInstall.certificateFile = null;