From 937ece025e63a3ebc4e1476c4953e9e16de98b51 Mon Sep 17 00:00:00 2001 From: usmannasir Date: Mon, 14 Oct 2024 15:58:47 +0500 Subject: [PATCH] bug fix: deploy wp to end user --- plogical/acl.py | 6 +++--- plogical/applicationInstaller.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plogical/acl.py b/plogical/acl.py index 883dce276..1ca505dc5 100644 --- a/plogical/acl.py +++ b/plogical/acl.py @@ -714,7 +714,7 @@ class ACLManager: elif childDomain.master.admin == admin: return 1 else: - if childDomain.master.admin.owner.pk == admin: + if childDomain.master.admin.owner == admin: return 1 except: @@ -722,10 +722,10 @@ class ACLManager: if currentACL['admin'] == 1: return 1 - elif domainName.admin.pk == admin: + elif domainName.admin == admin: return 1 else: - if domainName.admin.owner.pk == admin: + if domainName.admin.owner == admin: return 1 else: return 0 diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index e84f7b50c..fa27583eb 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -1924,7 +1924,9 @@ class ApplicationInstaller(multi.Thread): website.phpSelection = 'PHP 8.0' website.save() - if ACLManager.checkOwnership(website.domain, self.extraArgs['adminID'], + admin = Administrator.objects.get(pk=self.extraArgs['adminID']) + + if ACLManager.checkOwnership(website.domain, admin, self.extraArgs['currentACL']) == 0: statusFile = open(tempStatusPath, 'w') statusFile.writelines('You dont own this site.[404]')