diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index c8528e247..290365d92 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -2707,11 +2707,6 @@ app.controller('listWebsites', function ($scope, $http, $window) { return 'https://' + url; }; - $scope.deleteWPSite = function(wp) { - if (confirm('Are you sure you want to delete this WordPress site? This action cannot be undone.')) { - window.location.href = '/websites/ListWPSites?DeleteID=' + wp.id; - } - }; $scope.updateSetting = function(wp, setting) { var settingMap = { @@ -5859,11 +5854,7 @@ app.controller('listWebsites', function ($scope, $http, $window) { return 'https://' + url; }; - $scope.deleteWPSite = function(wp) { - if (confirm('Are you sure you want to delete this WordPress site? This action cannot be undone.')) { - window.location.href = '/websites/ListWPSites?DeleteID=' + wp.id; - } - }; + $scope.updateSetting = function(wp, setting) { var settingMap = { diff --git a/websiteFunctions/templates/websiteFunctions/WPsitesList.html b/websiteFunctions/templates/websiteFunctions/WPsitesList.html index 9f97cf420..2f71d8eac 100644 --- a/websiteFunctions/templates/websiteFunctions/WPsitesList.html +++ b/websiteFunctions/templates/websiteFunctions/WPsitesList.html @@ -110,13 +110,26 @@ GLobalAjaxCall($http, "{% url 'GetCurrentPlugins' %}", data, function(response) { if (response.data.status === 1) { - var plugins = JSON.parse(response.data.plugins); - site.activePlugins = plugins.filter(function(p) { return p.status === 'active'; }).length; - site.totalPlugins = plugins.length; + try { + var plugins = JSON.parse(response.data.plugins); + // WordPress CLI returns an array of objects with 'name' and 'status' properties + site.activePlugins = plugins.filter(function(p) { + return p.status && p.status.toLowerCase() === 'active'; + }).length; + site.totalPlugins = plugins.length; + } catch (e) { + console.error('Error parsing plugin data:', e); + site.activePlugins = 'Error'; + site.totalPlugins = 'Error'; + } + } else { + site.activePlugins = 'Error'; + site.totalPlugins = 'Error'; } }, function(response) { site.activePlugins = 'Error'; + site.totalPlugins = 'Error'; } ); }