From ce4ccc21ddf9b4fc6bb3fc0f705748b6878a14ba Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Tue, 3 Jul 2018 18:04:03 +0200
Subject: [PATCH] Set better defaults and placeholder text for alternate
 domains

---
 src/views/apps.html | 2 +-
 src/views/apps.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/apps.html b/src/views/apps.html
index 84f69123e..f23083170 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -124,7 +124,7 @@
                                   <input type="checkbox" id="appConfigureAlternateSubdomainInput" ng-model="appConfigure.alternateDomainEnabled">
                                   <label class="control-label" for="appConfigureAlternateSubdomainInput">Enable alternate domain redirecting to this app</label>
                                   <div class="input-group form-inline">
-                                    <input type="text" class="form-control" ng-model="appConfigure.alternateSubdomain" id="appConfigureAlternateSubdomainInput" name="alternateSubdomain" placeholder="{{ 'Leave empty to use bare domain' }}" ng-disabled="!appConfigure.alternateDomainEnabled">
+                                    <input type="text" class="form-control" ng-model="appConfigure.alternateSubdomain" id="appConfigureAlternateSubdomainInput" name="alternateSubdomain" placeholder="Leave empty to use bare domain" ng-disabled="!appConfigure.alternateDomainEnabled">
 
                                     <div class="input-group-btn">
                                       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" ng-disabled="!appConfigure.alternateDomainEnabled">
diff --git a/src/views/apps.js b/src/views/apps.js
index c5213e1fc..1cf4239ed 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -56,7 +56,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.alternateDomain = app.alternateDomains[0] ? app.alternateDomains[0].domain : $scope.appConfigure.domain.domain;
             $scope.appConfigure.robotsTxt = app.robotsTxt;
             $scope.appConfigure.enableBackup = app.enableBackup;
             $scope.appConfigure.mailboxName = app.mailboxName || '';