composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-26 20:18:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3007 - Warn the user that installing a patch on a non conform install is not recommended

Browse Source
This commit is contained in:
Eric
2020-06-04 10:38:58 +02:00
parent 8064a20718
commit 9d8a7bf561
6 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-core-update/src/Controller/AjaxController.php
View File

@@ -28,7 +28,8 @@ class AjaxController extends Controller
try
{
$bCanUpdateCore = FilesInformation::CanUpdateCore($sMessage);
$sCanUpdateCore = FilesInformation::CanUpdateCore($sMessage);
$bCanUpdateCore = ($sCanUpdateCore == 'Yes');
$aParams['bStatus'] = $bCanUpdateCore;
if ($bCanUpdateCore)
{
@@ -36,7 +37,7 @@ class AjaxController extends Controller
}
else
{
$aParams['sMessage'] = Dict::Format('iTopUpdate:UI:CanCoreUpdate:No', $sMessage);
$aParams['sMessage'] = Dict::Format("iTopUpdate:UI:CanCoreUpdate:{$sCanUpdateCore}", $sMessage);
}
} catch (FileNotExistException $e)
{