Merge branch 'staging' into develop

apache · May 18, 2023 · bd36538 · bd36538
2 parents a64264c + 984b261
commit bd36538
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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 @@ def handle(self, *args, **options):
                             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/...static/django_airavata_workspace/js/components/storage/ExperimentStorageViewContainer.vue b/...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>