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

Merge remote-tracking branch 'origin/support/2.5'

Browse Source 
# Conflicts:
#	application/applicationextension.inc.php
#	webservices/rest.php
This commit is contained in:
Pierre Goiffon
2019-03-08 14:35:02 +01:00
parent 856c037bb0 75a0979eee
commit 94092f445f
4 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -1163,10 +1163,30 @@ class ObjectFormManager extends FormManager
}
elseif ($oAttDef->GetEditClass() === 'CustomFields')
{
if (!empty($value['template_data']) && !empty($value['user_data']))
// We don't update attribute as ormCustomField comparaison is not working as excepted.
// When several templates available, "template_id" is not sent by the portal has it is a read-only select input
// therefore, the TemplateFieldsHandler::CompareValues() doesn't work.
// This use case works in the console as it always send all fields, even hidden and read-only.
// Different templates
if( isset($value['template_id'])
&& ($value['template_id'] != $value['current_template_id']) )
{
$this->oObject->Set($sAttCode, $value);
}
// Same template, different fields
elseif(isset($value['template_id'], $value['template_data'])
&& ($value['template_id'] == $value['current_template_id'])
&& ($value['template_data'] != $value['current_template_data']) )
{
$this->oObject->Set($sAttCode, $value);
}
// Update of current values
elseif(isset($value['user_data']))
{
$this->oObject->Set($sAttCode, $value);
}
// Else don't update! Otherwise we might loose current value
}
else
{