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

Fix for #427 implemented into branch 1.1 (delete all team members)

Browse Source 
SVN:1.1[1330]
This commit is contained in:
Romain Quetiez
2011-07-05 09:38:04 +00:00
parent f6aeeb0aaa
commit 71d3a9e443
2 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2069,16 +2069,49 @@ EOF
/** /**
* Updates the object from the POSTed parameters * Updates the object from the POSTed parameters
*/ */
public function UpdateObject($sFormPrefix = '') public function UpdateObject($sFormPrefix = '', $aAttList = null)
{ {
$aErrors = array(); $aErrors = array();
if (!is_array($aAttList))
{
$aAttList = $this->FlattenZList(MetaModel::GetZListItems(get_class($this), 'details'));
// Special case to process the case log, if any...
// WARNING: if you change this also check the functions DisplayModifyForm and DisplayCaseLog
foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef) foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
{ {
if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect()) $iFlags = $this->GetAttributeFlags($sAttCode);
if ($oAttDef instanceof AttributeCaseLog)
{
if (!($iFlags & (OPT_ATT_HIDDEN|OPT_ATT_SLAVE|OPT_ATT_READONLY)))
{
// The case log is editable, append it to the list of fields to retrieve
$aAttList[] = $sAttCode;
}
}
}
}
foreach($aAttList as $sAttCode)
{
$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
$iFlags = $this->GetAttributeFlags($sAttCode);
if ($oAttDef->IsWritable())
{
if ( $iFlags & (OPT_ATT_HIDDEN | OPT_ATT_READONLY))
{
// Non-visible, or read-only attribute, do nothing
}
elseif($iFlags & OPT_ATT_SLAVE)
{
$value = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null);
if (!is_null($value) && ($value != $this->Get($sAttCode)))
{
$aErrors[] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $oAttDef->GetLabel());
}
}
elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
{ {
$aLinks = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null); $aLinks = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null);
if (is_null($aLinks)) continue;
$sLinkedClass = $oAttDef->GetLinkedClass(); $sLinkedClass = $oAttDef->GetLinkedClass();
$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote(); $sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
$sExtKeyToMe = $oAttDef->GetExtKeyToMe(); $sExtKeyToMe = $oAttDef->GetExtKeyToMe();
@@ -2119,21 +2152,6 @@ EOF
} }
$this->Set($sAttCode, $oLinkedSet); $this->Set($sAttCode, $oLinkedSet);
} }
else if ($oAttDef->IsWritable())
{
$iFlags = $this->GetAttributeFlags($sAttCode);
if ( $iFlags & (OPT_ATT_HIDDEN | OPT_ATT_READONLY))
{
// Non-visible, or read-only attribute, do nothing
}
elseif($iFlags & OPT_ATT_SLAVE)
{
$value = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null);
if (!is_null($value) && ($value != $this->Get($sAttCode)))
{
$aErrors[] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $oAttDef->GetLabel());
}
}
elseif ($oAttDef->GetEditClass() == 'Document') elseif ($oAttDef->GetEditClass() == 'Document')
{ {
// There should be an uploaded file with the named attr_<attCode> // There should be an uploaded file with the named attr_<attCode>

4
synchro/synchrodatasource.class.inc.php
View File

@@ -456,9 +456,9 @@ EOF
return parent::GetAttributeFlags($sAttCode, $aReasons); return parent::GetAttributeFlags($sAttCode, $aReasons);
} }
public function UpdateObject($sFormPrefix = '') public function UpdateObject($sFormPrefix = '', $sAttList = null)
{ {
parent::UpdateObject($sFormPrefix); parent::UpdateObject($sFormPrefix, $sAttList);
// And now read the other post parameters... // And now read the other post parameters...
$oAttributeSet = $this->Get('attribute_list'); $oAttributeSet = $this->Get('attribute_list');
$aAttributes = array(); $aAttributes = array();