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

6
src/views/apps.html
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>