diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 95ef0be0e..2998b74fb 100644 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -17883,13 +17883,18 @@ app.controller('launchChild', function ($scope, $http) { $scope.hideLogs = true; }; - $scope.fileManagerURL = "/filemanager/" + $("#domainNamePage").text(); - $scope.previewUrl = "/preview/" + $("#childDomain").text() + "/"; - $scope.wordPressInstallURL = "/websites/" + $("#childDomain").text() + "/wordpressInstall"; - $scope.joomlaInstallURL = "/websites/" + $("#childDomain").text() + "/joomlaInstall"; - $scope.setupGit = "/websites/" + $("#childDomain").text() + "/setupGit"; - $scope.installPrestaURL = "/websites/" + $("#childDomain").text() + "/installPrestaShop"; - $scope.installMagentoURL = "/websites/" + $("#childDomain").text() + "/installMagento"; + // Watch for when the scope variables are initialized from ng-init + $scope.$watch('childDomainName', function(newVal) { + if (newVal) { + $scope.fileManagerURL = "/filemanager/" + $scope.masterDomain; + $scope.previewUrl = "/preview/" + $scope.childDomainName + "/"; + $scope.wordPressInstallURL = "/websites/" + $scope.childDomainName + "/wordpressInstall"; + $scope.joomlaInstallURL = "/websites/" + $scope.childDomainName + "/joomlaInstall"; + $scope.setupGit = "/websites/" + $scope.childDomainName + "/setupGit"; + $scope.installPrestaURL = "/websites/" + $scope.childDomainName + "/installPrestaShop"; + $scope.installMagentoURL = "/websites/" + $scope.childDomainName + "/installMagento"; + } + }); var logType = 0; $scope.pageNumber = 1; diff --git a/websiteFunctions/templates/websiteFunctions/launchChild.html b/websiteFunctions/templates/websiteFunctions/launchChild.html index badb31538..69ba6aa26 100644 --- a/websiteFunctions/templates/websiteFunctions/launchChild.html +++ b/websiteFunctions/templates/websiteFunctions/launchChild.html @@ -6,6 +6,8 @@ {% load static %} {% get_current_language as LANGUAGE_CODE %} + +
-
+

@@ -1243,6 +1245,6 @@

- +
{% endblock %}