From 274510137842e6e481f549727be4ee2b3566552e Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 12 May 2022 09:26:12 -0700
Subject: [PATCH] clone: use manifest from the backup

---
 src/views/app.html |  4 ++--
 src/views/app.js   | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/app.html b/src/views/app.html
index 84bbe8503..0eb7f669e 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -457,7 +457,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
-        <button type="button" class="btn btn-danger" ng-click="restore.submit()"><i class="fas fa-history" ng-hide="restore.busy"></i><i class="fa fa-circle-notch fa-spin" ng-show="clone.busy"></i> {{ 'app.restoreDialog.restoreAction' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-click="restore.submit()"><i class="fas fa-history" ng-hide="restore.busy"></i><i class="fa fa-circle-notch fa-spin" ng-show="restore.busy"></i> {{ 'app.restoreDialog.restoreAction' | tr }}</button>
       </div>
     </div>
   </div>
@@ -494,7 +494,7 @@
             </div>
 
             <div class="has-error text-center" ng-show="clone.error.secondaryDomain">{{ clone.error.secondaryDomain }}</div>
-            <div ng-repeat="(env, info) in app.manifest.httpPorts">
+            <div ng-repeat="(env, info) in clone.backup.manifest.httpPorts">
               <ng-form name="secondaryDomainInfo_form">
                 <div class="form-group" ng-class="{ 'has-error': (!secondaryDomainInfo_form.itemName{{$index}}.$dirty && clone.error.secondaryDomain) || (secondaryDomainInfo_form.itemName{{$index}}.$dirty && secondaryDomainInfo_form.itemName{{$index}}.$invalid) || (clone.error.location.fqdn === clone.secondaryDomains[env].subdomain + '.' + clone.secondaryDomains[env].domain.domain) }">
                   <label class="control-label" for="secondaryDomainInput{{env}}">
diff --git a/src/views/app.js b/src/views/app.js
index 7da56ee6d..8c988d9d5 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -1585,7 +1585,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         portBindingsEnabled: {},
 
         show: function (backup) {
-            var app = $scope.app; // FIXME: should choose "app" from the backup's manifest
+            var app = $scope.app;
 
             $scope.clone.error = {};
             $scope.clone.backup = backup;
@@ -1595,14 +1595,16 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.clone.overwriteDns = false;
 
             $scope.clone.secondaryDomains = {};
-            app.secondaryDomains.forEach(function (sd) {
-                $scope.clone.secondaryDomains[sd.environmentVariable] = {
-                    subdomain: sd.subdomain,
-                    domain: $scope.domains.filter(function (d) { return d.domain === sd.domain; })[0]
-                };
-            });
 
-            $scope.clone.portBindingsInfo = angular.extend({}, app.manifest.tcpPorts, app.manifest.udpPorts);   // Portbinding map only for information
+            var httpPorts = backup.manifest.httpPorts || {};
+            for (var env2 in httpPorts) {
+                $scope.clone.secondaryDomains[env2] = {
+                    subdomain: httpPorts[env2].defaultValue || '',
+                    domain: $scope.clone.domain
+                };
+            }
+
+            $scope.clone.portBindingsInfo = angular.extend({}, backup.manifest.tcpPorts, backup.manifest.udpPorts);   // Portbinding map only for information
             // set default ports
             for (var env in $scope.clone.portBindingsInfo) {
                 $scope.clone.portBindings[env] = $scope.clone.portBindingsInfo[env].defaultValue || 0;