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

N°8807 - Error saving when a DoCheckToWrite check of the linkset fails

Browse Source
This commit is contained in:
Anne-Cath
2025-10-17 17:14:10 +02:00
parent 6226ac8746
commit b80aa236f2
4 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/exceptions/CoreCannotSaveObjectException.php
View File

@@ -40,12 +40,16 @@ class CoreCannotSaveObjectException extends CoreException
/**
* @return string
* @since 3.2.3 add param $bWithHeader
*/
public function getHtmlMessage()
public function getHtmlMessage($bWithHeader = false)
{
$sTitle = Dict::S('UI:Error:SaveFailed');
$sContent = "<span><strong>".utils::HtmlEntities($sTitle)."</strong></span>";
if ($bWithHeader) {
$oObject = MetaModel::GetObject($this->sObjectClass, $this->iObjectId, true, true);
$sContent .= "&nbsp;<span>".$oObject->Get('friendlyname')."</span>";
}
if (count($this->aIssues) == 1) {
$sIssue = reset($this->aIssues);
$sContent .= "&nbsp;<span>".utils::HtmlEntities($sIssue)."</span>";

9
core/ormlinkset.class.inc.php
View File

@@ -859,6 +859,15 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
return $oLinkSet;
}
public function RemoveRemoved()
{
$this->aRemoved = [];
}
public function GetRemoved()
{
return $this->aRemoved ;
}
/**
* GetValues.
*

1
dictionaries/en.dictionary.itop.ui.php
View File

@@ -968,6 +968,7 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:SystemIntrusion' => 'Access denied. You have requested an operation that is not allowed for you.',
'UI:FatalErrorMessage' => 'Fatal error, '.ITOP_APPLICATION_SHORT.' cannot continue.',
'UI:Error_Details' => 'Error: %1$s.',
'UI:LinkedSet:RemovedObjectsDuringRefresh' => 'Warning: removed object(s) in <b>%1$s</b> are there again : <br>%2$s',
'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' user management - profile projections',
'UI:UserManagement:Class' => 'Class',

31
sources/Controller/Base/Layout/ObjectController.php
View File

@@ -6,6 +6,7 @@
namespace Combodo\iTop\Controller\Base\Layout;
use AttributeLinkedSet;
use Combodo\iTop\Application\WebPage\AjaxPage;
use ApplicationContext;
use ApplicationException;
@@ -661,13 +662,35 @@ JS;
// Found issues, explain and give the user a second chance
//
$bDisplayDetails = false;
$aIssues = $e->getIssues();
if ($this->IsHandlingXmlHttpRequest()) {
$aResult['data'] = ['error_message' => $e->getHtmlMessage()];
} else {
$oPage->AddHeaderMessage($e->getHtmlMessage(), 'message_error');
$oObj->DisplayModifyForm($oPage,
array('wizard_container' => true)); // wizard_container: display the wizard border and the title
//8807 - displayModifyForm fail if a linkset is removed -> remove removed linkset and display a specific message
$bWithLinkedSetRemoved = false;
foreach ($oObj->ListChanges() as $sAttCode => $aChange) {
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
if ($oAttDef instanceof AttributeLinkedSet) {
$aRemoved = $aChange->GetRemoved();
if (count($aRemoved) > 0) {
$bWithLinkedSetRemoved = true;
$sLinkedClass = $oAttDef->GetLinkedClass();
$aRemovedObjectFriendlyName = [];
foreach ($aRemoved as $key=>$value) {
$oLinkedObject = MetaModel::GetObject($sLinkedClass, $key, true, true);
$aRemovedObjectFriendlyName[] = $oLinkedObject->Get('friendlyname');
}
$aChange->RemoveRemoved();
$sRemovedMessage = Dict::Format('UI:LinkedSet:RemovedObjectsDuringRefresh', $oAttDef->GetLabel(), implode('<br> ', $aRemovedObjectFriendlyName));
$oPage->AddHeaderMessage($sRemovedMessage, 'message_info');
}
}
}
if($bWithLinkedSetRemoved) {
$oPage->AddHeaderMessage($e->getHtmlMessage(true), 'message_error');
} else {
$oPage->AddHeaderMessage($e->getHtmlMessage(), 'message_error');
}
$oObj->DisplayModifyForm($oPage, array('wizard_container' => true)); // wizard_container: display the wizard border and the title
}
}