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

N°653.2 Lifecycle: Fixed a regression introduced on r4767, transition buttons not working properly when editing an object.

Browse Source 
SVN:trunk[4951]
This commit is contained in:
Guillaume Lajarige
2017-09-29 08:23:13 +00:00
parent 6aa782bd8b
commit dd70275b41
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3764,7 +3764,15 @@ EOF
$oPage->add('</fieldset>');
}
}
/**
* @param $sCurrentState
* @param $sStimulus
* @param $bOnlyNewOnes
* @return array
* @throws ApplicationException
* @deprecated Since iTop 2.4, use DBObject::GetTransitionAttributes() instead.
*/
public function GetExpectedAttributes($sCurrentState, $sStimulus, $bOnlyNewOnes)
{
$aTransitions = $this->EnumTransitions();

2
pages/UI.php
View File

@@ -88,7 +88,7 @@ function ApplyNextAction(Webpage $oP, CMDBObject $oObj, $sNextAction)
throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sNextAction, $oObj->GetName(), $oObj->GetStateLabel()));
}
// Get the list of missing mandatory fields for the target state, considering only the changes from the previous form (i.e don't prompt twice)
$aExpectedAttributes = $oObj->GetExpectedAttributes($oObj->GetState(), $sNextAction, true /* $bOnlyNewOnes */);
$aExpectedAttributes = $oObj->GetTransitionAttributes($sNextAction);
if (count($aExpectedAttributes) == 0)
{