From 812ecf40414aad8b88f0b93b954a82cb162e829b Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 19 Dec 2024 15:27:00 +0100 Subject: [PATCH] disable archiving for pre-8.2 backups the sso situation complicates implementing restore for those --- dashboard/public/translation/en.json | 2 +- dashboard/public/views/app.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json index effd62c44..e76735064 100644 --- a/dashboard/public/translation/en.json +++ b/dashboard/public/translation/en.json @@ -1824,7 +1824,7 @@ "description": "The latest app backup will be added to the App Archive. The app will be uninstalled, but can be restored from the Backups View. Other backups will be cleaned up based on the backup policy.", "action": "Archive", "latestBackupInfo": "The last backup was created at {{date}}.", - "noBackup": "This app has no backup. Archiving requires at least one backup." + "noBackup": "This app has no backup. Archiving requires a recent backup." }, "archiveDialog": { "title": "Archive {{app}}", diff --git a/dashboard/public/views/app.js b/dashboard/public/views/app.js index 37f396b39..03437a0dd 100644 --- a/dashboard/public/views/app.js +++ b/dashboard/public/views/app.js @@ -1757,7 +1757,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location' $scope.uninstall.latestBackup = null; Client.getAppBackups($scope.app.id, function (error, backups) { - if (!error && backups.length) $scope.uninstall.latestBackup = backups[0]; + // only backups with appConfig (post 8.2) are candidates for archive + if (!error && backups.length) $scope.uninstall.latestBackup = backups[0].appConfig ? backups[0] : null; }); },