From 4eed5bdeb9df2df0a4da4aeeae3a1f56f64d2ca4 Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Wed, 27 Mar 2024 10:12:21 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B07165=20-=20Error=20message=20on=20applic?=
 =?UTF-8?q?ation=20upgrade=20fatal=20Error=20due=20to=20CSS=20compilation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/UpdateController.php             |  3 +--
 .../templates/SelectUpdateFile.ready.js.twig        | 13 ++++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php b/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
index 6f6c08eb1..ac0b9a58e 100644
--- a/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
+++ b/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
@@ -45,6 +45,7 @@ class UpdateController extends Controller
 		$aParams['sFileUploadMaxSize'] = utils::BytesToFriendlyFormat($aParams['iFileUploadMaxSize']);
 		$aParams['sPostMaxSize'] = ini_get('post_max_size');
 		$aParams['sUploadMaxSize'] = ini_get('upload_max_filesize');
+		$aParams['bDontUpgradeIfIntegrityFailed'] = !utils::IsDevelopmentEnvironment();
 		$oFilter = DBObjectSearch::FromOQL('SELECT ModuleInstallation WHERE parent_id=0 AND name!="datamodel"');
 		$oSet = new DBObjectSet($oFilter, ['installed' => false]); // Most recent first
 		$aParams['oSet'] = $oSet;
@@ -129,7 +130,6 @@ class UpdateController extends Controller
 		$sTransactionId = utils::GetNewTransactionId();
 		$aParams['sTransactionId'] = $sTransactionId;
 
-		$this->AddSaas('css/backoffice/main.scss');
 		$this->m_sOperation = 'ConfirmUpdate';
 		$this->DisplaySetupPage($aParams);
 	}
@@ -158,7 +158,6 @@ class UpdateController extends Controller
 			'sAjaxURL'        => utils::GetAbsoluteUrlAppRoot().'/pages/UI.php',
 		];
 		$this->AddLinkedScript(utils::GetAbsoluteUrlAppRoot().'setup/jquery.progression.js');
-		$this->AddSaas('css/backoffice/main.scss');
 		$this->AddSaas('env-'.utils::GetCurrentEnvironment().'/itop-core-update/css/itop-core-update.scss');
 		$this->m_sOperation = 'UpdateCoreFiles';
 		$this->DisplaySetupPage($aParams);
diff --git a/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig b/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig
index eb1789412..853f8d92e 100644
--- a/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig
+++ b/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig
@@ -28,10 +28,17 @@ $.ajax({
             $("#file-container").removeClass("ibo-is-hidden");
             $("#check-in-progress").addClass("ibo-is-hidden");
         } else {
-            $("#check-update").prop("disabled", true);
-            $("#file").prop("disabled", true);
-            $('#form-update-outer').slideUp(600);
             oRequirements.addClass("ibo-is-failure");
+            {% if bDontUpgradeIfIntegrityFailed %}
+                $("#check-update").prop("disabled", true);
+                $("#file").prop("disabled", true);
+                $('#form-update-outer').slideUp(600);
+            {% else %}
+                $("#check-update").prop("disabled", false);
+                $("#file").prop("disabled", false);
+                $("#file-container").removeClass("ibo-is-hidden");
+                $("#check-in-progress").addClass("ibo-is-hidden");
+            {% endif %}
         }
     }
 });