You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/10/15 19:38:59 UTC
[8/8] airavata-django-portal git commit: AIRAVATA-2537 Show index of
projects being displayed
AIRAVATA-2537 Show index of projects being displayed
Project: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/commit/c2df89a1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/tree/c2df89a1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/diff/c2df89a1
Branch: refs/heads/master
Commit: c2df89a15a4d8fa0df6d2398ddc6384ac4ac103a
Parents: 5397f67
Author: Marcus Christie <ma...@iu.edu>
Authored: Sun Oct 15 15:38:44 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Sun Oct 15 15:38:44 2017 -0400
----------------------------------------------------------------------
django_airavata/apps/api/views.py | 4 +++-
.../js/views/ProjectListContainer.vue | 13 +++++++++++++
.../static/common/js/utils/PaginationIterator.js | 2 ++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/c2df89a1/django_airavata/apps/api/views.py
----------------------------------------------------------------------
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index 4dc4d0f..cc9c37e 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -150,7 +150,9 @@ class APIResultPagination(pagination.LimitOffsetPagination):
return Response(OrderedDict([
('next', self.get_next_link() if has_next_link else None),
('previous', self.get_previous_link()),
- ('results', data)
+ ('results', data),
+ ('limit', self.limit),
+ ('offset', self.offset)
]))
def get_next_link(self):
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/c2df89a1/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue
----------------------------------------------------------------------
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue
index 46b2e21..171b882 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue
@@ -1,6 +1,9 @@
<template>
<div>
<project-list v-bind:projects="projects"></project-list>
+ <div>
+ Showing {{ first }} - {{ last }}
+ </div>
<div v-if="hasNext">
<a href="#" v-on:click.prevent="nextProjects">Next</a>
</div>
@@ -43,6 +46,16 @@ export default {
},
hasPrevious: function() {
return this.projectsPaginator && this.projectsPaginator.hasPrevious();
+ },
+ first: function() {
+ return this.projectsPaginator ? this.projectsPaginator.offset + 1 : null;
+ },
+ last: function() {
+ if (this.projectsPaginator) {
+ return this.projectsPaginator.offset + this.projectsPaginator.results.length;
+ } else {
+ return null;
+ }
}
},
beforeMount: function () {
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/c2df89a1/django_airavata/static/common/js/utils/PaginationIterator.js
----------------------------------------------------------------------
diff --git a/django_airavata/static/common/js/utils/PaginationIterator.js b/django_airavata/static/common/js/utils/PaginationIterator.js
index 438c616..d27855b 100644
--- a/django_airavata/static/common/js/utils/PaginationIterator.js
+++ b/django_airavata/static/common/js/utils/PaginationIterator.js
@@ -38,6 +38,8 @@ export default class PaginationIterator {
} else {
this.results = pagedResponse.results;
}
+ this.offset = pagedResponse.offset;
+ this.limit = pagedResponse.limit;
return this;
}
}
\ No newline at end of file