Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-01-26 01:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix to websites search

Browse Source
This commit is contained in:
usmannasir
2019-02-24 15:37:19 +05:00
parent 114bab218f
commit c294ef107e
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plogical/acl.py
View File

@@ -365,13 +365,29 @@ class ACLManager:
return websiteNames
@staticmethod
def searchWebsiteObjects(userID, searchTerm):
admin = Administrator.objects.get(pk=userID)
return Websites.objects.filter(admin=admin, domain__istartswith=searchTerm)
def searchWebsiteObjects(currentACL, userID, searchTerm):
if currentACL['admin'] == 1:
return Websites.objects.filter(domain__istartswith=searchTerm)
else:
websiteList = []
admin = Administrator.objects.get(pk=userID)
websites = admin.websites_set.filter(domain__istartswith=searchTerm)
for items in websites:
websiteList.append(items)
admins = Administrator.objects.filter(owner=admin.pk)
for items in admins:
webs = items.websites_set.filter(domain__istartswith=searchTerm)
for web in webs:
websiteList.append(web)
return websiteList
@staticmethod
def findWebsiteObjects(currentACL, userID):
if currentACL['admin'] == 1:
return Websites.objects.all()
else:

12
plogical/website.py
View File

@@ -252,7 +252,13 @@ class WebsiteManager:
def searchWebsites(self, userID = None, data = None):
try:
currentACL = ACLManager.loadedACL(userID)
json_data = self.searchWebsitesJson(userID, data['patternAdded'])
try:
json_data = self.searchWebsitesJson(currentACL, userID, data['patternAdded'])
except BaseException, msg:
tempData = {}
tempData['page'] = 1
return self.getFurtherAccounts(userID, tempData)
pagination = self.websitePagination(currentACL, userID)
final_dic = {'status': 1, 'listWebSiteStatus': 1, 'error_message': "None", "data": json_data, 'pagination': pagination}
final_json = json.dumps(final_dic)
@@ -2032,9 +2038,9 @@ Host gitlab.com
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
def searchWebsitesJson(self, userID, searchTerm):
def searchWebsitesJson(self, currentlACL, userID, searchTerm):
websites = ACLManager.searchWebsiteObjects(userID, searchTerm)
websites = ACLManager.searchWebsiteObjects(currentlACL, userID, searchTerm)
json_data = "["
checker = 0