diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index f39798297..2b38c563e 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -499,7 +499,7 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) { patternAdded: $scope.patternAdded }; - dataurl = "/websites/searchWebsites"; + dataurl = "/websites/searchChilds"; $http.post(dataurl, data, config).then(ListInitialData, cantLoadInitialData); diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index f39798297..2b38c563e 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -499,7 +499,7 @@ app.controller('listChildDomainsMain', function ($scope, $http, $timeout) { patternAdded: $scope.patternAdded }; - dataurl = "/websites/searchWebsites"; + dataurl = "/websites/searchChilds"; $http.post(dataurl, data, config).then(ListInitialData, cantLoadInitialData); diff --git a/websiteFunctions/urls.py b/websiteFunctions/urls.py index 98b1ebee3..ce5861be1 100755 --- a/websiteFunctions/urls.py +++ b/websiteFunctions/urls.py @@ -52,7 +52,7 @@ urlpatterns = [ url(r'^fetchDomains$', views.fetchDomains, name='submitDomainCreation'), url(r'^changePHP$', views.changePHP, name='changePHP'), url(r'^submitDomainDeletion$', views.submitDomainDeletion, name='submitDomainDeletion'), - + url(r'^searchChilds$', views.searchChilds, name='searchChilds'), # crons url(r'^listCron$',views.listCron,name="listCron"), diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py index ee245b14e..ee1a1ec5f 100755 --- a/websiteFunctions/views.py +++ b/websiteFunctions/views.py @@ -125,6 +125,14 @@ def searchWebsites(request): except KeyError: return redirect(loadLoginPage) +def searchChilds(request): + try: + userID = request.session['userID'] + wm = WebsiteManager() + return wm.searchChilds(userID, json.loads(request.body)) + except KeyError: + return redirect(loadLoginPage) + def getFurtherAccounts(request): try: userID = request.session['userID'] diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 48e51cedd..3c77f9425 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -358,6 +358,27 @@ class WebsiteManager: json_data = json.dumps(dic) return HttpResponse(json_data) + def searchChilds(self, userID=None, data=None): + try: + currentACL = ACLManager.loadedACL(userID) + + websites = ACLManager.findWebsiteObjects(currentACL, userID) + childDomains = [] + + for web in websites: + for child in web.childdomains_set.filter(domain__istartswith=data['patternAdded']): + childDomains.append(child) + + json_data = self.findChildsListJson(childDomains) + + final_dic = {'status': 1, 'listWebSiteStatus': 1, 'error_message': "None", "data": json_data} + final_json = json.dumps(final_dic) + return HttpResponse(final_json) + except BaseException as msg: + dic = {'status': 1, 'listWebSiteStatus': 0, 'error_message': str(msg)} + json_data = json.dumps(dic) + return HttpResponse(json_data) + def getFurtherAccounts(self, userID=None, data=None): try: currentACL = ACLManager.loadedACL(userID) @@ -373,7 +394,6 @@ class WebsiteManager: json_data = json.dumps(dic) return HttpResponse(json_data) - def fetchWebsitesList(self, userID=None, data=None): try: currentACL = ACLManager.loadedACL(userID)