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 2023/02/28 14:22:52 UTC

[airavata-django-portal] 01/01: Merge branch 'staging'

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 aee3d8f1010b27d8ea9d2455e31cdf7c76fab45e
Merge: 847cb628 fbcbf853
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Feb 28 09:22:17 2023 -0500

    Merge branch 'staging'

 .../statistics/ExperimentDetailsView.vue           | 11 ++++
 django_airavata/apps/api/authentication.py         |  7 +++
 django_airavata/apps/api/serializers.py            | 65 +++++++++++++++++++--
 .../django_airavata_api/js/models/DataProduct.js   |  1 +
 .../js/models/UserStorageDirectory.js              |  2 +
 .../js/models/UserStorageFile.js                   |  1 +
 .../js/models/UserStoragePath.js                   |  5 ++
 django_airavata/apps/api/view_utils.py             | 67 ++++++++++++++++++++++
 django_airavata/apps/api/views.py                  |  9 ++-
 django_airavata/apps/auth/middleware.py            | 27 +++++----
 .../experiment/input-editors/FileInputEditor.vue   | 27 ++++++---
 .../components/storage/UserStorageCreateView.vue   |  5 +-
 .../storage/UserStorageFileSelectionContainer.vue  |  1 +
 .../components/storage/UserStoragePathViewer.vue   | 44 +++++++++++++-
 .../storage-edit/UserStorageTextEditViewer.vue     | 17 +++++-
 .../js/containers/UserStorageContainer.vue         |  1 +
 .../common/js/components/UnsavedChangesGuard.vue   | 10 +++-
 requirements.txt                                   |  2 +-
 18 files changed, 267 insertions(+), 35 deletions(-)