From d38ad3a17fb66ea8e4aaeb90c7da26d61d49e23c Mon Sep 17 00:00:00 2001
From: badrAZ <azizbibadr@gmail.com>
Date: Wed, 8 Aug 2018 11:45:34 +0200
Subject: [PATCH] feat(xo-web/backup-ng/new): move compression in the advanced
 settings (#3281)

See #2711
---
 CHANGELOG.md                                  |  1 +
 .../xo-web/src/xo-app/backup-ng/new/index.js  | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed2c38e56..7c2a65648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [Health / Orphaned snapshot VDIs] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3270](https://github.com/vatesfr/xen-orchestra/pull/3270))
 - [Health / Alarms] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3271](https://github.com/vatesfr/xen-orchestra/pull/3271))
 - [Backup NG Overview] List the Backup NG job's modes [#3169](https://github.com/vatesfr/xen-orchestra/issues/3169) (PR [#3277](https://github.com/vatesfr/xen-orchestra/pull/3277))
+- [Backup NG form] Move "Use compression" checkbox in the advanced settings [#2711](https://github.com/vatesfr/xen-orchestra/issues/2711) (PR [#3281](https://github.com/vatesfr/xen-orchestra/pull/3281))
 
 ### Bug fixes
 
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 97cf95f7f..96fa79064 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
@@ -599,17 +599,6 @@ export default [
                       />
                     </FormGroup>
                   )}
-                  {state.showCompression && (
-                    <label>
-                      <input
-                        checked={compression}
-                        name='compression'
-                        onChange={effects.setCheckboxValue}
-                        type='checkbox'
-                      />{' '}
-                      <strong>{_('useCompression')}</strong>
-                    </label>
-                  )}
                 </CardBlock>
               </Card>
               <FormFeedback
@@ -840,6 +829,19 @@ export default [
                       />
                     </label>
                   </FormGroup>
+                  {state.showCompression && (
+                    <FormGroup>
+                      <label>
+                        <strong>{_('useCompression')}</strong>{' '}
+                        <input
+                          checked={compression}
+                          name='compression'
+                          onChange={effects.setCheckboxValue}
+                          type='checkbox'
+                        />
+                      </label>
+                    </FormGroup>
+                  )}
                 </CardBlock>
               </Card>
             </Col>