From a9fbcf3962b9996e4eb93b479c98341221c339bc Mon Sep 17 00:00:00 2001
From: MlssFrncJrg <119158464+Pizzosaure@users.noreply.github.com>
Date: Wed, 22 Nov 2023 11:04:30 +0100
Subject: [PATCH] feat(xo-web/new VM): always show ISO selector (#7166)

Fixes #3464
---
 CHANGELOG.unreleased.md                    |  1 +
 packages/xo-web/src/xo-app/new-vm/index.js | 68 +++++++++++-----------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 7e5f6ede8e4..8d6e03a0997 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -11,6 +11,7 @@
 - [VM/Console] Add a message to indicate that the console view has been [disabled](https://support.citrix.com/article/CTX217766/how-to-disable-the-console-for-the-vm-in-xencenter) for this VM [#6319](https://github.com/vatesfr/xen-orchestra/issues/6319) (PR [#7161](https://github.com/vatesfr/xen-orchestra/pull/7161))
 - [Restore] Show source remote and restoration time on a restored VM (PR [#7186](https://github.com/vatesfr/xen-orchestra/pull/7186))
 - [Backup/Import] Show disk import status during Incremental Replication or restoration of Incremental Backup (PR [#7171](https://github.com/vatesfr/xen-orchestra/pull/7171))
+- [VM Creation] Added ISO option in new VM form when creating from template with a disk [#3464](https://github.com/vatesfr/xen-orchestra/issues/3464) (PR [#7166](https://github.com/vatesfr/xen-orchestra/pull/7166))
 
 ### Bug fixes
 
diff --git a/packages/xo-web/src/xo-app/new-vm/index.js b/packages/xo-web/src/xo-app/new-vm/index.js
index 5de7fb12cad..6d474c4406a 100644
--- a/packages/xo-web/src/xo-app/new-vm/index.js
+++ b/packages/xo-web/src/xo-app/new-vm/index.js
@@ -1223,40 +1223,6 @@ export default class NewVm extends BaseComponent {
           </SectionContent>
         ) : (
           <SectionContent>
-            <Item>
-              <span className={styles.item}>
-                <input
-                  checked={installMethod === 'ISO'}
-                  name='installMethod'
-                  onChange={this._linkState('installMethod')}
-                  type='radio'
-                  value='ISO'
-                />
-                &nbsp;
-                <span>{_('newVmIsoDvdLabel')}</span>
-                &nbsp;
-                <span className={styles.inlineSelect}>
-                  {this.props.pool ? (
-                    <SelectVdi
-                      disabled={installMethod !== 'ISO'}
-                      onChange={this._linkState('installIso')}
-                      predicate={isVdiPresent}
-                      srPredicate={this._getIsoPredicate()}
-                      value={installIso}
-                    />
-                  ) : (
-                    <SelectResourceSetsVdi
-                      disabled={installMethod !== 'ISO'}
-                      onChange={this._linkState('installIso')}
-                      predicate={isVdiPresent}
-                      resourceSet={this._getResolvedResourceSet()}
-                      srPredicate={this._getIsoPredicate()}
-                      value={installIso}
-                    />
-                  )}
-                </span>
-              </span>
-            </Item>
             {template.virtualizationMode === 'pv' ? (
               <span>
                 <Item>
@@ -1295,6 +1261,40 @@ export default class NewVm extends BaseComponent {
             )}
           </SectionContent>
         )}
+        <SectionContent>
+          <span className={styles.item}>
+            <input
+              checked={installMethod === 'ISO'}
+              name='installMethod'
+              onChange={this._linkState('installMethod')}
+              type='radio'
+              value='ISO'
+            />
+            &nbsp;
+            <span>{_('newVmIsoDvdLabel')}</span>
+            &nbsp;
+            <span className={styles.inlineSelect}>
+              {this.props.pool ? (
+                <SelectVdi
+                  disabled={installMethod !== 'ISO'}
+                  onChange={this._linkState('installIso')}
+                  predicate={isVdiPresent}
+                  srPredicate={this._getIsoPredicate()}
+                  value={installIso}
+                />
+              ) : (
+                <SelectResourceSetsVdi
+                  disabled={installMethod !== 'ISO'}
+                  onChange={this._linkState('installIso')}
+                  predicate={isVdiPresent}
+                  resourceSet={this._getResolvedResourceSet()}
+                  srPredicate={this._getIsoPredicate()}
+                  value={installIso}
+                />
+              )}
+            </span>
+          </span>
+        </SectionContent>
         {this._isCoreOs() && (
           <div>
             <label>{_('newVmCloudConfig')}</label>{' '}