From cdcd7154ba6a98c5da50a0fa18b11647f2a8ff62 Mon Sep 17 00:00:00 2001 From: badrAZ Date: Tue, 9 Apr 2019 15:12:52 +0200 Subject: [PATCH] fix(xo-web/backup-ng): only display full interval in case of delta (#4125) --- CHANGELOG.unreleased.md | 1 + .../_getSettingsWithNonDefaultValue.js | 1 + .../xo-web/src/xo-app/backup-ng/new/index.js | 22 ++++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 972d8bc08..26b24605e 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -10,6 +10,7 @@ ### Bug fixes - [Continuous Replication] Fix VHD size guess for empty files [#4105](https://github.com/vatesfr/xen-orchestra/issues/4105) (PR [#4107](https://github.com/vatesfr/xen-orchestra/pull/4107)) +- [Backup NG] Only display full backup interval in case of a delta backup (PR [#4125](https://github.com/vatesfr/xen-orchestra/pull/4107)) ### Released packages diff --git a/packages/xo-web/src/xo-app/backup-ng/_getSettingsWithNonDefaultValue.js b/packages/xo-web/src/xo-app/backup-ng/_getSettingsWithNonDefaultValue.js index 707621c49..82fc325ab 100644 --- a/packages/xo-web/src/xo-app/backup-ng/_getSettingsWithNonDefaultValue.js +++ b/packages/xo-web/src/xo-app/backup-ng/_getSettingsWithNonDefaultValue.js @@ -14,6 +14,7 @@ const MODES = { __proto__: null, compression: 'full', + fullInterval: 'delta', } const getSettingsWithNonDefaultValue = (mode, settings) => diff --git a/packages/xo-web/src/xo-app/backup-ng/new/index.js b/packages/xo-web/src/xo-app/backup-ng/new/index.js index 789b7ae80..f38e2e8fe 100644 --- a/packages/xo-web/src/xo-app/backup-ng/new/index.js +++ b/packages/xo-web/src/xo-app/backup-ng/new/index.js @@ -935,16 +935,18 @@ export default decorate([ placeholder={formatMessage(messages.timeoutUnit)} /> - - {' '} - - + {state.isDelta && ( + + {' '} + + + )} {state.isFull && (