diff --git a/websiteFunctions/templates/websiteFunctions/WPsitesList.html b/websiteFunctions/templates/websiteFunctions/WPsitesList.html index cc0d12d48..39ada0441 100644 --- a/websiteFunctions/templates/websiteFunctions/WPsitesList.html +++ b/websiteFunctions/templates/websiteFunctions/WPsitesList.html @@ -13,13 +13,13 @@ // Now add our controller to the module angular.module('CyberCP').controller('listWordPressSites', function($scope, $http) { - // Initialize scope variables - $scope.wpSites = JSON.parse('{{ wpsite|escapejs }}'); - $scope.debug = JSON.parse('{{ debug_info|default:"false"|escapejs }}'); - $scope.totalSites = parseInt('{{ total_sites|default:"0"|escapejs }}'); - $scope.userId = parseInt('{{ debug_info.user_id|default:"0"|escapejs }}'); - $scope.isAdmin = JSON.parse('{{ debug_info.is_admin|default:"false"|escapejs }}'); - $scope.wpSitesCount = parseInt('{{ debug_info.wp_sites_count|default:"0"|escapejs }}'); + // Initialize scope variables with pre-serialized JSON + $scope.wpSites = {{ wpsite|safe }}; + $scope.debug = {{ debug_info|safe }}; + $scope.totalSites = {{ total_sites }}; + $scope.userId = $scope.debug.user_id; + $scope.isAdmin = $scope.debug.is_admin; + $scope.wpSitesCount = $scope.debug.wp_sites_count; $scope.deleteWPSite = function(site) { if (confirm('Are you sure you want to delete this WordPress site? This action cannot be undone.')) { diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index b21a5ea27..fd13b6818 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -138,6 +138,7 @@ class WebsiteManager: return redirect(reverse('pricing')) def ListWPSites(self, request=None, userID=None, DeleteID=None): + import json currentACL = ACLManager.loadedACL(userID) admin = Administrator.objects.get(pk=userID) @@ -166,14 +167,14 @@ class WebsiteManager: }) context = { - "wpsite": sites, + "wpsite": json.dumps(sites), "status": 1, "total_sites": len(sites), - "debug_info": { + "debug_info": json.dumps({ "user_id": userID, - "is_admin": currentACL.get('admin', 0), + "is_admin": bool(currentACL.get('admin', 0)), "wp_sites_count": wp_sites.count() - } + }) } proc = httpProc(request, 'websiteFunctions/WPsitesList.html', context)