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

N°3931 Make object deletion errors more visible

Browse Source
This commit is contained in:
Stephen Abello
2021-09-29 14:53:02 +02:00
parent a35c80de57
commit 1f56e39577
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/cmdbabstract.class.inc.php
View File

@@ -5182,6 +5182,7 @@ EOF
foreach ($aDeletes as $iId => $aData) {
$oToDelete = $aData['to_delete'];
$bAutoDel = (($aData['mode'] == DEL_SILENT) || ($aData['mode'] == DEL_AUTO));
$sRowCssClass = '';
if (array_key_exists('issue', $aData))
{
if ($bAutoDel)
@@ -5201,6 +5202,7 @@ EOF
$sConsequence = Dict::Format('UI:Delete:MustBeDeletedManuallyButNotPossible',
$aData['issue']);
}
$sRowCssClass = 'ibo-is-alert';
}
else
{
@@ -5218,9 +5220,11 @@ EOF
else
{
$sConsequence = Dict::S('UI:Delete:MustBeDeletedManually');
$sRowCssClass = 'ibo-is-warning';
}
}
$aDisplayData[] = array(
'@class' => $sRowCssClass,
'class' => MetaModel::GetName(get_class($oToDelete)),
'object' => $oToDelete->GetHyperLink(),
'consequence' => $sConsequence,
@@ -5232,9 +5236,11 @@ EOF
foreach($aToUpdate as $iId => $aData)
{
$oToUpdate = $aData['to_reset'];
$sRowCssClass = '';
if (array_key_exists('issue', $aData))
{
$sConsequence = Dict::Format('UI:Delete:CannotUpdateBecause_Issue', $aData['issue']);
$sRowCssClass = 'ibo-is-alert';
}
else
{
@@ -5242,6 +5248,7 @@ EOF
$aData['attributes_list']);
}
$aDisplayData[] = array(
'@class' => $sRowCssClass,
'class' => MetaModel::GetName(get_class($oToUpdate)),
'object' => $oToUpdate->GetHyperLink(),
'consequence' => $sConsequence,
@@ -5285,13 +5292,16 @@ EOF
if ($oDeletionPlan->FoundStopper()) {
if ($oDeletionPlan->FoundSecurityIssue()) {
$oP->p(Dict::S('UI:Delete:SorryDeletionNotAllowed'));
} elseif ($oDeletionPlan->FoundManualOperation()) {
$oP->p(Dict::S('UI:Delete:PleaseDoTheManualOperations'));
} else // $bFoundManualOp
{
$oP->p(Dict::S('UI:Delete:PleaseDoTheManualOperations'));
$oFailAlertBlock = AlertUIBlockFactory::MakeForDanger('', Dict::S('UI:Delete:SorryDeletionNotAllowed'));
$oFailAlertBlock->SetIsClosable(false);
$oP->AddUiBlock($oFailAlertBlock);
}
else {
$oWarningAlertBlock = AlertUIBlockFactory::MakeForWarning('', Dict::S('UI:Delete:PleaseDoTheManualOperations'));
$oWarningAlertBlock->SetIsClosable(false);
$oP->AddUiBlock($oWarningAlertBlock);
}
$oForm = FormUIBlockFactory::MakeStandard('');
$oP->AddSubBlock($oForm);
$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('transaction_id', utils::ReadParam('transaction_id', '', false, 'transaction_id')));