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°721: ResolveFrom now only set attributes mandatory in resolved & closed states that aren't already set

Browse Source
This commit is contained in:
Stephen Abello
2018-11-16 17:19:45 +01:00
parent fb233709e0
commit a488c42dca
3 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
View File

@@ -1215,21 +1215,36 @@
<static>false</static>
<access>public</access>
<type>Internal</type>
<code><![CDATA[ public function ResolveFrom($oParentTicket)
<code><![CDATA[ public function ResolveFrom($oParentTicket)
{
if ($this->Get('status') != 'resolved')
if ($this->Get('status') != 'resolved' && $this->Get('status') != 'closed' )
{
$this->Set('servicesubcategory_id', $oParentTicket->Get('servicesubcategory_id'));
$this->Set('service_id', $oParentTicket->Get('service_id'));
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
$this->Set('resolution_code', $oParentTicket->Get('resolution_code'));
$aDummy = array();
$aExcludedAttributes = array('team_id', 'agent_id');
foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
{
// Exclude inter dependant attributes to keep consistency
if(in_array($sAttCode, $aExcludedAttributes))
{
continue;
}
if (($this->GetAttributeFlags($sAttCode, $aDummy, 'resolved') & OPT_ATT_MANDATORY) && empty($this->Get($sAttCode)))
{
$this->Set($sAttCode, $oParentTicket->Get($sAttCode));
}
}
if (($this->Get('team_id') == 0) || ($this->Get('agent_id') ==0))
{
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
}
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->Get('ref').']]';
$this->Set('solution', Dict::Format('Tickets:ResolvedFrom', $sParent, MetaModel::GetName(get_class($oParentTicket))));
$this->ApplyStimulus('ev_autoresolve');
$this->DBUpdate();
}
}]]></code>
}]]></code>
</method>
<method id="UpdateChildRequestLog">
<static>false</static>

31
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -1315,21 +1315,36 @@
<static>false</static>
<access>public</access>
<type>Internal</type>
<code><![CDATA[ public function ResolveFrom($oParentTicket)
<code><![CDATA[ public function ResolveFrom($oParentTicket)
{
if ($this->Get('status') != 'resolved')
if ($this->Get('status') != 'resolved' && $this->Get('status') != 'closed' )
{
$this->Set('servicesubcategory_id', $oParentTicket->Get('servicesubcategory_id'));
$this->Set('service_id', $oParentTicket->Get('service_id'));
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
$this->Set('resolution_code', $oParentTicket->Get('resolution_code'));
$aDummy = array();
$aExcludedAttributes = array('team_id', 'agent_id');
foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
{
// Exclude inter dependant attributes to keep consistency
if(in_array($sAttCode, $aExcludedAttributes))
{
continue;
}
if (($this->GetAttributeFlags($sAttCode, $aDummy, 'resolved') & OPT_ATT_MANDATORY) && empty($this->Get($sAttCode)))
{
$this->Set($sAttCode, $oParentTicket->Get($sAttCode));
}
}
if (($this->Get('team_id') == 0) || ($this->Get('agent_id') ==0))
{
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
}
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->Get('ref').']]';
$this->Set('solution', Dict::Format('Tickets:ResolvedFrom', $sParent, MetaModel::GetName(get_class($oParentTicket))));
$this->ApplyStimulus('ev_autoresolve');
$this->DBUpdate();
}
}]]></code>
}]]></code>
</method>
<method id="UpdateChildRequestLog">
<static>false</static>

29
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

@@ -1340,19 +1340,34 @@
<type>Internal</type>
<code><![CDATA[ public function ResolveFrom($oParentTicket)
{
if ($this->Get('status') != 'resolved')
if ($this->Get('status') != 'resolved' && $this->Get('status') != 'closed' )
{
$this->Set('servicesubcategory_id', $oParentTicket->Get('servicesubcategory_id'));
$this->Set('service_id', $oParentTicket->Get('service_id'));
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
$this->Set('resolution_code', $oParentTicket->Get('resolution_code'));
$aDummy = array();
$aExcludedAttributes = array('team_id', 'agent_id');
foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
{
// Exclude inter dependant attributes to keep consistency
if(in_array($sAttCode, $aExcludedAttributes))
{
continue;
}
if (($this->GetAttributeFlags($sAttCode, $aDummy, 'resolved') & OPT_ATT_MANDATORY) && empty($this->Get($sAttCode)))
{
$this->Set($sAttCode, $oParentTicket->Get($sAttCode));
}
}
if (($this->Get('team_id') == 0) || ($this->Get('agent_id') ==0))
{
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
}
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->Get('ref').']]';
$this->Set('solution', Dict::Format('Tickets:ResolvedFrom', $sParent, MetaModel::GetName(get_class($oParentTicket))));
$this->ApplyStimulus('ev_autoresolve');
$this->DBUpdate();
}
}]]></code>
}]]></code>
</method>
<method id="UpdateChildRequestLog">
<static>false</static>