composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-26 21:54:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°5658 - Fix spinning wheel appearing on all application upgrade buttons - move twig_base and itop-core-update to new router

Browse Source
This commit is contained in:
Eric Espie
2023-04-28 16:42:29 +02:00
parent 55628288aa
commit b1d32646d9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
View File

@@ -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()

2
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -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 */