change unblockMigrationConfirm message, show modal only if reason is …

…not null
vatesfr · Nov 26, 2024 · 4e8c6ee · 4e8c6ee
1 parent 2bc411d
commit 4e8c6ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
@@ -1522,7 +1522,7 @@ const messages = {
   protectFromShutdown: 'Protect from accidental shutdown',
   blockMigration: 'Block migration',
   unblockMigrationTitle: 'Unblock migration',
-  unblockMigrationConfirm: 'This will unblock migration',
+  unblockMigrationConfirm: 'Are you sure you want to unblock migration for this VM?',
   ha: 'HA',
   srHaTooltip: 'SR used for High Availability',
   nestedVirt: 'Nested virtualization',

diff --git a/packages/xo-web/src/xo-app/vm/tab-advanced.js b/packages/xo-web/src/xo-app/vm/tab-advanced.js
@@ -605,7 +605,10 @@ export default class TabAdvanced extends Component {
         ),
       })
 
-    if (blockedOperations !== undefined && ['migrate_send', 'pool_migrate'].some(op => op in blockedOperations)) {
+    if (
+      blockedOperations !== undefined &&
+      ['migrate_send', 'pool_migrate'].some(op => op in blockedOperations && blockedOperations[op].trim() !== 'true')
+    ) {
       confirm({
         title: _('unblockMigrationTitle'),
         body: (