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 <ma...@iu.edu>
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() {