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 2020/04/23 00:42:32 UTC
[airavata-django-portal] 02/02: Merge branch
'AIRAVATA-3126--Implement-compute-resource-reservation-addition'
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
commit eb52ef3eb492604431ab4ad26812e8ac566417b2
Merge: 4a0c407 8bd42d0
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Apr 22 20:41:03 2020 -0400
Merge branch 'AIRAVATA-3126--Implement-compute-resource-reservation-addition'
.../appcatalog/groupresourceprofile/ttypes.py | 217 +++++++++++++++---
.../ComputePreference.vue | 119 +++++++---
.../ComputeResourceReservationEditor.vue | 158 +++++++++++++
.../ComputeResourceReservationList.vue | 251 +++++++++++++++++++++
.../ComputeResourceReservationsSummary.vue | 45 ++++
.../GroupComputeResourcePreference.vue | 108 ++++++---
.../gatewayprofile/StoragePreferenceList.vue | 2 +-
django_airavata/apps/api/serializers.py | 9 +-
.../api/static/django_airavata_api/js/index.js | 2 +
.../django_airavata_api/js/models/BaseModel.js | 229 ++++++++++---------
.../js/models/ComputeResourceReservation.js | 65 ++++++
.../js/models/GroupComputeResourcePreference.js | 9 +-
django_airavata/settings_local.py.ide | 6 +-
.../static/common/js/components/DeleteButton.vue | 6 +-
.../static/common/js/components/HumanDate.vue | 2 +-
.../static/common/js/layouts/ListLayout.vue | 2 +
django_airavata/static/common/js/utils.js | 25 +-
17 files changed, 1048 insertions(+), 207 deletions(-)