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

caas always has a valid appstore token to show the appstore view

Browse Source
This commit is contained in:
Johannes Zellner
2017-01-18 13:05:25 +01:00
parent 804947f039
commit 4d139232bf
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webadmin/src/views/appstore.html
View File

@@ -193,7 +193,7 @@
</div>
<!-- appstore login -->
<div ng-show="ready && !cloudronDetails" class="card card-small appstore-login ng-cloak">
<div ng-show="ready && !validAppstoreAccount" class="card card-small appstore-login ng-cloak">
<div class="row">
<div class="col-md-12">
<h1 ng-show="appstoreLogin.register">App Store Signup</h1>
@@ -235,7 +235,7 @@
</div>
</div>
<div ng-show="ready && cloudronDetails" class="ng-cloak">
<div ng-show="ready && validAppstoreAccount" class="ng-cloak">
<div class="row-no-margin">
<div class="col-md-2">
</div>

16
webadmin/src/views/appstore.js
View File

@@ -13,7 +13,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.category = '';
$scope.cachedCategory = ''; // used to cache the selected category while searching
$scope.searchString = '';
$scope.cloudronDetails = null;
$scope.validAppstoreAccount = false;
$scope.appstoreConfig = null;
$scope.showRequestUpgrade = function () {
@@ -513,6 +513,12 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
function fetchAppstoreConfig(callback) {
callback = callback || function (error) { if (error) console.error(error); };
// caas always has a valid appstore account
if ($scope.config.provider === 'caas') {
$scope.validAppstoreAccount = true;
return callback();
}
Client.getAppstoreConfig(function (error, result) {
if (error) return callback(error);
@@ -520,10 +526,10 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.appstoreConfig = result;
AppStore.getCloudronDetails(result, function (error, result) {
AppStore.getCloudronDetails(result, function (error) {
if (error) return callback(error);
$scope.cloudronDetails = result;
$scope.validAppstoreAccount = true;
// clear busy state when a login/signup was performed
$scope.appstoreLogin.busy = false;
@@ -579,8 +585,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
});
// autofocus if appstore login is shown
$scope.$watch('cloudronDetails', function (newValue, oldValue) {
if (!oldValue) setTimeout(function () { $('[name=appstoreLoginForm]').find('[autofocus]:first').focus(); }, 1000);
$scope.$watch('validAppstoreAccount', function (newValue, oldValue) {
if (!newValue) setTimeout(function () { $('[name=appstoreLoginForm]').find('[autofocus]:first').focus(); }, 1000);
});
$('.modal-backdrop').remove();