From b1d32646d91291cc4e2007d003cd0da456dca7b1 Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Fri, 28 Apr 2023 16:42:29 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B05658=20-=20Fix=20spinning=20wheel=20appe?=
 =?UTF-8?q?aring=20on=20all=20application=20upgrade=20buttons=20-=20move?=
 =?UTF-8?q?=20twig=5Fbase=20and=20itop-core-update=20to=20new=20router?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/UpdateController.php              | 12 +++++++-----
 .../Application/TwigBase/Controller/Controller.php   |  2 +-
 2 files changed, 8 insertions(+), 6 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 de2ddf5e7..61cedf6cb 100644
--- a/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
+++ b/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
@@ -63,8 +63,8 @@ class UpdateController extends Controller
 			$sLaunchSetupUrl = Router::GetInstance()->GenerateUrl('core_update_ajax.launch_setup', ['transaction_id' => $sTransactionId]);
 			$aParams['sLaunchSetupUrl'] = $sLaunchSetupUrl;
 		}
-
-		$this->DisplayPage($aParams, 'SelectUpdateFile');
+		$this->m_sOperation = 'SelectUpdateFile';
+		$this->DisplayPage($aParams);
 	}
 
 	/**
@@ -130,7 +130,8 @@ class UpdateController extends Controller
 		$aParams['sTransactionId'] = $sTransactionId;
 
 		$this->AddSaas('env-'.utils::GetCurrentEnvironment().'/itop-core-update/css/itop-core-update.scss');
-		$this->DisplaySetupPage($aParams, 'ConfirmUpdate');
+		$this->m_sOperation = 'ConfirmUpdate';
+		$this->DisplaySetupPage($aParams);
 	}
 
 	public function OperationUpdateCoreFiles()
@@ -157,9 +158,10 @@ class UpdateController extends Controller
 			'sAjaxURL'        => utils::GetAbsoluteUrlAppRoot().'/pages/UI.php',
 		];
 		$this->AddLinkedScript(utils::GetAbsoluteUrlAppRoot().'setup/jquery.progression.js');
-		$this->AddSaas('env-'.utils::GetCurrentEnvironment().'/itop-core-update/css/itop-core-update.scss');
+		$this->AddSaas('css/backoffice/main.scss');
 
-		$this->DisplaySetupPage($aParams, 'UpdateCoreFiles');
+		$this->m_sOperation = 'UpdateCoreFiles';
+		$this->DisplaySetupPage($aParams);
 	}
 
     public function OperationRunSetup()
diff --git a/sources/Application/TwigBase/Controller/Controller.php b/sources/Application/TwigBase/Controller/Controller.php
index 7328a3be4..7c27e0ab9 100644
--- a/sources/Application/TwigBase/Controller/Controller.php
+++ b/sources/Application/TwigBase/Controller/Controller.php
@@ -49,7 +49,7 @@ abstract class Controller extends AbstractController
 	/** @var \Twig\Environment */
 	private $m_oTwig;
 	/** @var string */
-	private $m_sOperation;
+	protected $m_sOperation;
 	/** @var string */
 	private $m_sModule;
 	/** @var iTopWebPage|\AjaxPage */