improved wp display

This commit is contained in:
usmannasir
2025-04-03 23:41:07 +05:00
parent 4a45b10c05
commit ba4381569e

View File

@@ -2645,30 +2645,30 @@ app.controller('listWebsites', function ($scope, $http) {
if (!$scope.wp_sites) { if (!$scope.wp_sites) {
var url = '/websites/fetchWPDetails'; var url = '/websites/fetchWPDetails';
var data = {domain: $scope.selectedWebsite.domain}; var data = {
domain: $scope.selectedWebsite.domain,
websiteName: $scope.selectedWebsite.domain // Add websiteName parameter
};
$http({ $http({
method: 'POST', method: 'POST',
url: url, url: url,
data: data, data: $.param(data), // Use jQuery param for proper form encoding
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
'X-CSRFToken': getCookie('csrftoken') 'X-CSRFToken': getCookie('csrftoken')
},
transformRequest: function(obj) {
var str = [];
for(var p in obj)
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
return str.join("&");
} }
}).then(function(response) { }).then(function(response) {
console.log('WP Details Response:', response); // Debug log console.log('WP Details Response:', response); // Debug log
if (response.data && response.data.status === 1 && response.data.data) { if (response.data && response.data.status === 1) {
try { try {
$scope.wp_sites = response.data.data.map(function(site) { // If single site, wrap in array
var sites = Array.isArray(response.data.data) ? response.data.data : [response.data.data];
$scope.wp_sites = sites.map(function(site) {
return { return {
id: site.id || '', id: site.id || $scope.selectedWebsite.domain,
title: site.title || site.domain || $scope.selectedWebsite.domain, title: site.title || site.domain || $scope.selectedWebsite.domain,
url: site.url || 'http://' + $scope.selectedWebsite.domain, url: site.url || 'http://' + $scope.selectedWebsite.domain,
version: site.version || 'Unknown', version: site.version || 'Unknown',
@@ -2691,24 +2691,39 @@ app.controller('listWebsites', function ($scope, $http) {
}); });
} }
} else { } else {
console.error('Invalid response format:', response); // Debug log // Create default site if no data
new PNotify({ $scope.wp_sites = [{
title: 'Error', id: $scope.selectedWebsite.domain,
text: response.data && response.data.error_message ? title: $scope.selectedWebsite.domain,
response.data.error_message : url: 'http://' + $scope.selectedWebsite.domain,
'Failed to fetch WordPress site details. Invalid response format.', version: 'Unknown',
type: 'error' phpVersion: 'Unknown',
}); theme: 'Unknown',
activePlugins: 0,
searchIndex: false,
debugging: false,
passwordProtection: false,
maintenanceMode: false
}];
$scope.web.showWPSites = true;
} }
}).catch(function(error) { }).catch(function(error) {
console.error('WP Details Error:', error); // Debug log console.error('WP Details Error:', error); // Debug log
new PNotify({ // Create default site on error
title: 'Error', $scope.wp_sites = [{
text: error.data && error.data.error_message ? id: $scope.selectedWebsite.domain,
error.data.error_message : title: $scope.selectedWebsite.domain,
'Connection failed while fetching WordPress site details.', url: 'http://' + $scope.selectedWebsite.domain,
type: 'error' version: 'Unknown',
}); phpVersion: 'Unknown',
theme: 'Unknown',
activePlugins: 0,
searchIndex: false,
debugging: false,
passwordProtection: false,
maintenanceMode: false
}];
$scope.web.showWPSites = true;
}); });
} else { } else {
$scope.web.showWPSites = !$scope.web.showWPSites; $scope.web.showWPSites = !$scope.web.showWPSites;
@@ -6627,30 +6642,30 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
if (!$scope.wp_sites) { if (!$scope.wp_sites) {
var url = '/websites/fetchWPDetails'; var url = '/websites/fetchWPDetails';
var data = {domain: $scope.selectedWebsite.domain}; var data = {
domain: $scope.selectedWebsite.domain,
websiteName: $scope.selectedWebsite.domain // Add websiteName parameter
};
$http({ $http({
method: 'POST', method: 'POST',
url: url, url: url,
data: data, data: $.param(data), // Use jQuery param for proper form encoding
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
'X-CSRFToken': getCookie('csrftoken') 'X-CSRFToken': getCookie('csrftoken')
},
transformRequest: function(obj) {
var str = [];
for(var p in obj)
str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
return str.join("&");
} }
}).then(function(response) { }).then(function(response) {
console.log('WP Details Response:', response); // Debug log console.log('WP Details Response:', response); // Debug log
if (response.data && response.data.status === 1 && response.data.data) { if (response.data && response.data.status === 1) {
try { try {
$scope.wp_sites = response.data.data.map(function(site) { // If single site, wrap in array
var sites = Array.isArray(response.data.data) ? response.data.data : [response.data.data];
$scope.wp_sites = sites.map(function(site) {
return { return {
id: site.id || '', id: site.id || $scope.selectedWebsite.domain,
title: site.title || site.domain || $scope.selectedWebsite.domain, title: site.title || site.domain || $scope.selectedWebsite.domain,
url: site.url || 'http://' + $scope.selectedWebsite.domain, url: site.url || 'http://' + $scope.selectedWebsite.domain,
version: site.version || 'Unknown', version: site.version || 'Unknown',
@@ -6673,24 +6688,39 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
}); });
} }
} else { } else {
console.error('Invalid response format:', response); // Debug log // Create default site if no data
new PNotify({ $scope.wp_sites = [{
title: 'Error', id: $scope.selectedWebsite.domain,
text: response.data && response.data.error_message ? title: $scope.selectedWebsite.domain,
response.data.error_message : url: 'http://' + $scope.selectedWebsite.domain,
'Failed to fetch WordPress site details. Invalid response format.', version: 'Unknown',
type: 'error' phpVersion: 'Unknown',
}); theme: 'Unknown',
activePlugins: 0,
searchIndex: false,
debugging: false,
passwordProtection: false,
maintenanceMode: false
}];
$scope.web.showWPSites = true;
} }
}).catch(function(error) { }).catch(function(error) {
console.error('WP Details Error:', error); // Debug log console.error('WP Details Error:', error); // Debug log
new PNotify({ // Create default site on error
title: 'Error', $scope.wp_sites = [{
text: error.data && error.data.error_message ? id: $scope.selectedWebsite.domain,
error.data.error_message : title: $scope.selectedWebsite.domain,
'Connection failed while fetching WordPress site details.', url: 'http://' + $scope.selectedWebsite.domain,
type: 'error' version: 'Unknown',
}); phpVersion: 'Unknown',
theme: 'Unknown',
activePlugins: 0,
searchIndex: false,
debugging: false,
passwordProtection: false,
maintenanceMode: false
}];
$scope.web.showWPSites = true;
}); });
} else { } else {
$scope.web.showWPSites = !$scope.web.showWPSites; $scope.web.showWPSites = !$scope.web.showWPSites;
@@ -11256,7 +11286,6 @@ app.controller('BuyAddons', function ($scope, $http) {
planName: planName, planName: planName,
monthlyPrice: monthlyPrice, monthlyPrice: monthlyPrice,
yearlyPrice: yearlyPrice, yearlyPrice: yearlyPrice,
lifetime: lifetime,
returnURL: currentURL, // Add the current URL as a query parameter returnURL: currentURL, // Add the current URL as a query parameter
months: months months: months
}); });