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

Make app install dialog multi domain aware

Browse Source
This commit is contained in:
Johannes Zellner
2017-11-08 01:25:42 +01:00
parent 20a37030b6
commit 707d34cb89
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,16 @@
<label class="control-label" for="appInstallLocationInput">Location {{ appInstall.error.location }} </label>
<div class="input-group form-inline">
<input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="Leave empty to use bare domain" autofocus>
<div class="input-group-addon">
{{ !appInstall.location ? '' : (config.isCustomDomain ? '.' : '-') }}{{ config.fqdn }}
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{{ (config.isCustomDomain ? '.' : '-') + appInstall.domain }}
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li ng-repeat="domain in domains">
<a href="" ng-click="appInstall.domain = domain">{{ domain }}</a>
</li>
</ul>
</div>
</div>
</div>

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

@@ -12,7 +12,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.user = Client.getUserInfo();
$scope.users = [];
$scope.groups = [];
$scope.dnsConfig = {};
$scope.domains = [];
$scope.category = '';
$scope.cachedCategory = ''; // used to cache the selected category while searching
$scope.searchString = '';
@@ -496,14 +496,14 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
});
}
function fetchDnsConfig() {
Client.getDnsConfig(function (error, result) {
function getDomains() {
Client.getDomains(function (error, result) {
if (error) {
console.error(error);
return $timeout(fetchDnsConfig, 5000);
return $timeout(getDomains, 5000);
}
$scope.dnsConfig = result;
$scope.domains = result.map(function (d) { return d.domain; });
});
}
@@ -561,7 +561,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
fetchUsers();
fetchGroups();
fetchDnsConfig();
getDomains();
getMailConfig();
fetchAppstoreConfig(function (error) {