From commits-return-20060-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Tue Nov 20 19:44:06 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2652C18064E for ; Tue, 20 Nov 2018 19:44:05 +0100 (CET) Received: (qmail 85113 invoked by uid 500); 20 Nov 2018 18:44:05 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 85104 invoked by uid 99); 20 Nov 2018 18:44:05 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2018 18:44:05 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C43D685420; Tue, 20 Nov 2018 18:44:04 +0000 (UTC) Date: Tue, 20 Nov 2018 18:44:04 +0000 To: "commits@airavata.apache.org" Subject: [airavata-django-portal] branch master updated: AIRAVATA-2954 Create PaginationIterator even when there is no next page MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154273944442.1502.16633238374060066675@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata-django-portal X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 460167575a44e2627b89039260be3329a06380af X-Git-Newrev: 43354b16d517efe8af62139a193488ee6262a968 X-Git-Rev: 43354b16d517efe8af62139a193488ee6262a968 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git The following commit(s) were added to refs/heads/master by this push: new 43354b1 AIRAVATA-2954 Create PaginationIterator even when there is no next page 43354b1 is described below commit 43354b16d517efe8af62139a193488ee6262a968 Author: Marcus Christie AuthorDate: Tue Nov 20 13:43:44 2018 -0500 AIRAVATA-2954 Create PaginationIterator even when there is no next page --- .../apps/api/static/django_airavata_api/js/services/ServiceFactory.js | 2 +- .../static/django_airavata_groups/js/group-listing-entry-point.js | 1 - django_airavata/static/common/js/components/Pager.vue | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/django_airavata/apps/api/static/django_airavata_api/js/services/ServiceFactory.js b/django_airavata/apps/api/static/django_airavata_api/js/services/ServiceFactory.js index 7d9d408..2d54136 100644 --- a/django_airavata/apps/api/static/django_airavata_api/js/services/ServiceFactory.js +++ b/django_airavata/apps/api/static/django_airavata_api/js/services/ServiceFactory.js @@ -185,7 +185,7 @@ class ServiceFactory { } } let paginationHandler = (data) => { - if (config.pagination === true && data.next) { + if (config.pagination === true && 'next' in data) { return new PaginationIterator(data, config.modelClass); } else if (data instanceof Array) { return data.map(item => resultHandler(item)); diff --git a/django_airavata/apps/groups/static/django_airavata_groups/js/group-listing-entry-point.js b/django_airavata/apps/groups/static/django_airavata_groups/js/group-listing-entry-point.js index 6799b36..71b46f5 100755 --- a/django_airavata/apps/groups/static/django_airavata_groups/js/group-listing-entry-point.js +++ b/django_airavata/apps/groups/static/django_airavata_groups/js/group-listing-entry-point.js @@ -19,7 +19,6 @@ new Vue({ beforeMount: function () { if (this.$el.dataset.groupsOwnersData) { this.groupsOwnersData = JSON.parse(this.$el.dataset.groupsOwnersData); - console.log(this.groupsOwnersData); } } }) diff --git a/django_airavata/static/common/js/components/Pager.vue b/django_airavata/static/common/js/components/Pager.vue index 4069822..32d9d7b 100644 --- a/django_airavata/static/common/js/components/Pager.vue +++ b/django_airavata/static/common/js/components/Pager.vue @@ -19,7 +19,6 @@ export default { props: { paginator: utils.PaginationIterator, }, - props: ['paginator'], name: 'pager', methods: { getNext: function() {