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

caas: Fix display of alternateDomain

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-09-04 12:10:21 -07:00
parent cb25217c48
commit 2fd1caa2aa
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/apps.html
+4 -2
View File
@@ -130,12 +130,14 @@
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" ng-disabled="!appConfigure.alternateDomainEnabled">
{{ (!appConfigure.alternateSubdomain ? '' : '.') + appConfigure.alternateDomain }}
<!-- the admin check is to check for spaces user -->
<span ng-if="user.admin">{{ (!appConfigure.alternateSubdomain ? '' : (appConfigure.alternateDomain.config.hyphenatedSubdomains ? '-' : '.')) + appConfigure.alternateDomain.domain }}</span>
<span ng-if="!user.admin">{{ (!appConfigure.alternateSubdomain ? '' : '-') + spacesSuffix + (appConfigure.alternateDomain.config.hyphenatedSubdomains ? '-' : '.') + appConfigure.alternateDomain.domain }}</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li ng-repeat="domain in domains">
<a href="" ng-click="appConfigure.alternateDomain = domain.domain">{{ domain.domain }}</a>
<a href="" ng-click="appConfigure.alternateDomain = domain">{{ domain.domain }}</a>
</li>
</ul>
</div>
src/views/apps.js
+4 -4
View File
@@ -17,7 +17,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
busy: false,
error: {},
app: {},
domain: '',
domain: null,
location: '',
advancedVisible: false,
portBindings: {},
@@ -37,7 +37,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
xFrameOptions: '',
alternateDomainEnabled: false,
alternateSubdomain: '',
alternateDomain: '',
alternateDomain: null,
ssoAuth: false,
isAccessRestrictionValid: function () {
@@ -61,7 +61,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
$scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
$scope.appConfigure.alternateDomainEnabled = !!app.alternateDomains[0];
$scope.appConfigure.alternateSubdomain = app.alternateDomains[0] ? app.alternateDomains[0].subdomain : '';
$scope.appConfigure.alternateDomain = app.alternateDomains[0] ? app.alternateDomains[0].domain : $scope.appConfigure.domain.domain;
$scope.appConfigure.alternateDomain = app.alternateDomains[0] ? $scope.domains.filter(function (d) { return d.domain === app.alternateDomains[0].domain; })[0] : $scope.appConfigure.domain;
$scope.appConfigure.robotsTxt = app.robotsTxt;
$scope.appConfigure.enableBackup = app.enableBackup;
$scope.appConfigure.mailboxName = app.mailboxName || '';
@@ -144,7 +144,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
};
// The backend supports multiple alternateDomains, however we only have ui for one
if ($scope.appConfigure.alternateDomainEnabled) data.alternateDomains = [{ domain: $scope.appConfigure.alternateDomain, subdomain: $scope.appConfigure.alternateSubdomain }];
if ($scope.appConfigure.alternateDomainEnabled) data.alternateDomains = [{ domain: $scope.appConfigure.alternateDomain.domain, subdomain: $scope.appConfigure.alternateSubdomain }];
if ($scope.appConfigure.mailboxName !== $scope.appConfigure.app.mailboxName) data.mailboxName = $scope.appConfigure.mailboxName;