From 1782d3009144aedb4080e9748af3576a02ce6dad Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Mon, 16 Jun 2025 17:52:38 +0500
Subject: [PATCH] bug fix delete child domain

---
 .../websiteFunctions/websiteFunctions.js      | 266 +++++++++++++++++-
 .../websiteFunctions/listChildDomains.html    |  10 +-
 2 files changed, 270 insertions(+), 6 deletions(-)

diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index dc3fa96ba..cadf1c05b 100644
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -465,6 +465,18 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -1313,6 +1325,18 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
 
                 } else {
@@ -1706,6 +1730,18 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
                     
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
+                    
                     // Re-enable buttons
                     $('#createbackupbutton').prop('disabled', false).html('<i class="fas fa-download"></i> Create Backup');
                     $('button[ng-click="CreateStagingNow()"]').prop('disabled', false).html('<i class="fas fa-clone"></i> Create Staging Site');
@@ -2245,6 +2281,18 @@ app.controller('RestoreWPBackup', function ($scope, $http, $timeout, $window) {
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
                     
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
+                    
                     // Re-enable buttons
                     $('#createbackupbutton').prop('disabled', false).html('<i class="fas fa-download"></i> Create Backup');
                     $('button[ng-click="CreateStagingNow()"]').prop('disabled', false).html('<i class="fas fa-clone"></i> Create Staging Site');
@@ -3151,7 +3199,6 @@ app.controller('listWebsites', function ($scope, $http, $window) {
         });
     };
 
-    $scope.cyberPanelLoading = true;
 
     $scope.issueSSL = function (virtualHost) {
         $scope.cyberPanelLoading = false;
@@ -3778,6 +3825,18 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -4605,6 +4664,18 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
 
                 } else {
@@ -5304,6 +5375,18 @@ app.controller('RestoreWPBackup', function ($scope, $http, $timeout, $window) {
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
                     
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
+                    
                     // Re-enable buttons
                     $('#createbackupbutton').prop('disabled', false).html('<i class="fas fa-download"></i> Create Backup');
                     $('button[ng-click="CreateStagingNow()"]').prop('disabled', false).html('<i class="fas fa-clone"></i> Create Staging Site');
@@ -5945,6 +6028,18 @@ app.controller('createWebsite', function ($scope, $http, $timeout, $window) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -6861,6 +6956,18 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -6928,6 +7035,7 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) {
                     text: 'Child Domain successfully deleted.',
                     type: 'success'
                 });
+                $('#DeleteChild').modal('hide');
                 $scope.getFurtherWebsitesFromDB();
             } else {
                 new PNotify({
@@ -7495,6 +7603,18 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -8322,6 +8442,18 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
 
                 } else {
@@ -9146,6 +9278,18 @@ app.controller('RestoreWPBackup', function ($scope, $http, $timeout, $window) {
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
                     
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
+                    
                     // Re-enable buttons
                     $('#createbackupbutton').prop('disabled', false).html('<i class="fas fa-download"></i> Create Backup');
                     $('button[ng-click="CreateStagingNow()"]').prop('disabled', false).html('<i class="fas fa-clone"></i> Create Staging Site');
@@ -10416,6 +10560,18 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -12106,6 +12262,18 @@ app.controller('websitePages', function ($scope, $http, $timeout, $window) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -13603,6 +13771,18 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
                     fetchDomains();
 
                 } else {
@@ -14513,6 +14693,18 @@ app.controller('installWordPressCTRL', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -14630,6 +14822,18 @@ app.controller('installJoomlaCTRL', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -14807,6 +15011,18 @@ app.controller('setupGit', function ($scope, $http, $timeout, $window) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
                     $timeout(function () {
                         $window.location.reload();
                     }, 3000);
@@ -15129,6 +15345,18 @@ app.controller('installPrestaShopCTRL', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -15317,6 +15545,18 @@ app.controller('installMauticCTRL', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -15838,6 +16078,18 @@ app.controller('cloneWebsite', function ($scope, $http, $timeout, $window) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
@@ -17621,6 +17873,18 @@ app.controller('createDockerSite', function ($scope, $http, $timeout) {
                     $scope.installPercentage = "100";
                     $scope.currentStatus = response.data.currentStatus;
                     $timeout.cancel();
+                    
+                    new PNotify({
+                        title: 'Success!',
+                        text: 'Domain successfully converted to website.',
+                        type: 'success'
+                    });
+                    
+                    setTimeout(function() {
+                        $('#settings').modal('hide');
+                        $scope.getFurtherWebsitesFromDB();
+                        $scope.$apply();
+                    }, 2000);
 
                 } else {
 
diff --git a/websiteFunctions/templates/websiteFunctions/listChildDomains.html b/websiteFunctions/templates/websiteFunctions/listChildDomains.html
index 8a80dfdca..643849c45 100644
--- a/websiteFunctions/templates/websiteFunctions/listChildDomains.html
+++ b/websiteFunctions/templates/websiteFunctions/listChildDomains.html
@@ -538,7 +538,7 @@
             <div class="page-title-section">
                 <h1 class="page-title">
                     {% trans "List Child Domains" %}
-                    <span ng-hide="cyberPanelLoading" class="loading-spinner"></span>
+                    <span ng-show="cyberPanelLoading" class="loading-spinner"></span>
                 </h1>
                 <p class="page-subtitle">{% trans "Manage your sub-domains and addon domains from one place" %}</p>
             </div>
@@ -660,13 +660,13 @@
 </div>
 
 <!-- Delete Modal -->
-<div id="DeleteChild" class="modal fade" role="dialog">
+<div id="DeleteChild" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">
                     {% trans "Delete Sub/Addon Domain" %}
-                    <span ng-hide="cyberPanelLoading" class="loading-spinner"></span>
+                    <span ng-show="cyberPanelLoading" class="loading-spinner"></span>
                 </h4>
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
             </div>
@@ -699,13 +699,13 @@
 </div>
 
 <!-- Convert to Website Modal -->
-<div id="settings" class="modal fade" role="dialog">
+<div id="settings" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">
                     {% trans "Convert Sub/Addon Domain to Website" %}
-                    <span ng-hide="cyberPanelLoading" class="loading-spinner"></span>
+                    <span ng-show="cyberPanelLoading" class="loading-spinner"></span>
                 </h4>
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
             </div>