Merge branch 'stable' into p3

This commit is contained in:
Usman Nasir
2019-12-30 15:38:58 +05:00
8 changed files with 111 additions and 6 deletions

View File

@@ -3141,6 +3141,9 @@ app.controller('manageCronController', function ($scope, $http) {
app.controller('manageAliasController', function ($scope, $http, $timeout, $window) {
$('form').submit(function (e) {
e.preventDefault();
});
var masterDomain = "";
@@ -3153,6 +3156,14 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
$scope.manageAliasLoading = true;
$scope.operationSuccess = true;
$scope.createAliasEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.manageAliasLoading = false;
$scope.addAliasFunc();
}
};
$scope.showAliasForm = function (domainName) {
$scope.domainAliasForm = false;
@@ -5268,11 +5279,23 @@ app.controller('sshAccess', function ($scope, $http, $timeout) {
/* Java script code to cloneWebsite */
app.controller('cloneWebsite', function ($scope, $http, $timeout, $window) {
$('form').submit(function (e) {
e.preventDefault();
});
$scope.cyberpanelLoading = true;
$scope.installationDetailsForm = false;
$scope.installationProgress = true;
$scope.goBackDisable = true;
$scope.cloneEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.cyberpanelLoading = false;
$scope.startCloning();
}
};
var statusFile;
$scope.startCloning = function () {