This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/develop by this push:
new 4442cde5 AIRAVATA-3695 Bug fix for null reference
new f9b3dda3 Merge branch 'archive-user-data' into develop
4442cde5 is described below
commit 4442cde5e9f9a46ba6f4f3af8103980b810eeb45
Author: Marcus Christie <[email protected]>
AuthorDate: Thu Apr 20 16:00:40 2023 -0400
AIRAVATA-3695 Bug fix for null reference
---
.../src/components/statistics/ExperimentDetailsView.vue | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentDetailsView.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentDetailsView.vue
index b2ae0aef..1f806201 100644
---
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentDetailsView.vue
+++
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/statistics/ExperimentDetailsView.vue
@@ -257,12 +257,7 @@
<th scope="row">Experiment Data Dir</th>
<td>
<div>{{ experimentDataDir }}</div>
- <b-alert
- show
- variant="warning"
- v-if="experimentArchive.archived"
- class="mt-2"
- >
+ <b-alert show variant="warning" v-if="archived" class="mt-2">
This directory was archived in
<b>{{ experimentArchive.archive_name }}</b> on
{{ experimentArchive.created_date }}.
@@ -462,6 +457,9 @@ export default {
return null;
}
},
+ archived() {
+ return this.experimentArchive?.archived;
+ },
},
created() {
services.FullExperimentService.retrieve({