| commit | bd365382c8ab002aca10ea380c96e410f681d28d | [log] [tgz] |
|---|---|---|
| author | Marcus Christie <machristie@apache.org> | Thu May 18 15:37:35 2023 -0400 |
| committer | Marcus Christie <machristie@apache.org> | Thu May 18 15:37:35 2023 -0400 |
| tree | d307a42daff42eeb578eaea8e9e8e857f3c753b0 | |
| parent | a64264c10391df4bddeaa8663e18c3e508382dfc [diff] | |
| parent | 984b2614d671b0199f85d446b6ecf038e9e6ad48 [diff] |
Merge branch 'staging' into develop
diff --git a/django_airavata/apps/admin/management/commands/archive_user_data.py b/django_airavata/apps/admin/management/commands/archive_user_data.py index a79b1bc..bab8be5 100644 --- a/django_airavata/apps/admin/management/commands/archive_user_data.py +++ b/django_airavata/apps/admin/management/commands/archive_user_data.py
@@ -104,8 +104,10 @@ archive_path = archive_path.strip() if os.path.isfile(archive_path): os.remove(archive_path) - else: + elif os.path.isdir(archive_path): shutil.rmtree(archive_path) + else: + self.stdout.write(self.style.WARNING(f"Cannot delete {archive_path} as it is neither a file nor directory, perhaps was already removed")) archive_entry = models.UserDataArchiveEntry(user_data_archive=user_data_archive, entry_path=archive_path) archive_entry.save() except Exception as e:
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/ExperimentStorageViewContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/ExperimentStorageViewContainer.vue index 8868ed8..3c106d1 100644 --- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/ExperimentStorageViewContainer.vue +++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/ExperimentStorageViewContainer.vue
@@ -29,10 +29,10 @@ Experiment Data Directory does not exist in storage. </b-alert> - <small class="text-muted" v-if="archiveMaxAge > 0"> + <!-- <small class="text-muted" v-if="archiveMaxAge > 0"> Data is retained for {{ archiveMaxAge }} days before it is removed and archived. - </small> + </small> --> </b-card> </template>