From c5ac735e2440fc45f9653ee65dfea7be0278531c Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Thu, 1 Mar 2018 12:40:58 +0500 Subject: [PATCH] Bug fix to pagination. --- .../static/websiteFunctions/websiteFunctions.js | 2 +- websiteFunctions/templates/websiteFunctions/website.html | 5 ----- websiteFunctions/views.py | 6 ++---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 1446b50c5..52da87047 100644 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -114,7 +114,7 @@ app.controller('listWebsites', function($scope,$http) { function ListInitialData(response) { - if (response.data.listWebSiteStatus==1) { + if (response.data.listWebSiteStatus === 1) { var finalData = JSON.parse(response.data.data); $scope.WebSitesList = finalData; diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html index 003e2595c..07f4d00b8 100644 --- a/websiteFunctions/templates/websiteFunctions/website.html +++ b/websiteFunctions/templates/websiteFunctions/website.html @@ -96,11 +96,6 @@ - - - - - diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py index c46851e6a..a39dbbac3 100644 --- a/websiteFunctions/views.py +++ b/websiteFunctions/views.py @@ -529,7 +529,7 @@ def listWebsites(request): admin = Administrator.objects.get(pk=request.session['userID']) if admin.type == 1: - websites = admin.websites_set.all() + websites = Websites.objects.all() else: websites = Websites.objects.filter(admin=admin) @@ -547,6 +547,7 @@ def listWebsites(request): for i in range(1, finalPages): pagination.append('