diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 66ae5b847..9065e5a9e 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2121,6 +2121,138 @@ EOF
}
return $oObj->DisplayModifyForm( $oPage, $aExtraParams);
}
+
+ public function DisplayStimulusForm(WebPage $oPage, $sStimulus)
+ {
+ $sClass = get_class($this);
+ $aTransitions = $this->EnumTransitions();
+ $aStimuli = MetaModel::EnumStimuli($sClass);
+ if (!isset($aTransitions[$sStimulus]))
+ {
+ // Invalid stimulus
+ throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus, $this->GetName(), $this->GetStateLabel()));
+ }
+ $sActionLabel = $aStimuli[$sStimulus]->GetLabel();
+ $sActionDetails = $aStimuli[$sStimulus]->GetDescription();
+ $aTransition = $aTransitions[$sStimulus];
+ $sTargetState = $aTransition['target_state'];
+ $aTargetStates = MetaModel::EnumStates($sClass);
+ $oPage->add("\n");
+ $aTargetState = $aTargetStates[$sTargetState];
+ $aExpectedAttributes = $aTargetState['attribute_list'];
+ $oPage->add("$sActionDetails
\n");
+ $sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
+ if ($sButtonsPosition == 'bottom')
+ {
+ // bottom: Displays the ticket details BEFORE the actions
+ $oPage->add('');
+ $this->DisplayBareProperties($oPage);
+ $oPage->add('
');
+ }
+ $oPage->add("\n");
+ $oPage->add("
\n");
+ $oPage->add("
');
+ $this->DisplayBareProperties($oPage);
+ $oPage->add('
');
+ }
+
+ $iFieldsCount = count($aFieldsMap);
+ $sJsonFieldsMap = json_encode($aFieldsMap);
+
+ $oPage->add_script(
+<<add_ready_script(
+<<GetName(), $oObj->GetStateLabel()));
+ throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus,$this->GetName(),$this->GetStateLabel()));
}
$aTransition = $aTransitions[$sStimulus];
$sTargetState = $aTransition['target_state'];
diff --git a/pages/UI.php b/pages/UI.php
index 84e7889ca..f63670b48 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -398,6 +398,7 @@ try
case 'form_for_modify_all': // Form to modify multiple objects (bulk modify)
case 'bulk_stimulus': // For to apply a stimulus to multiple objects
case 'stimulus': // Form displayed when applying a stimulus (state change)
+ case 'apply_stimulus': // Form displayed when applying a stimulus (state change)
$oP->add_linked_script("../js/json.js");
$oP->add_linked_script("../js/forms-json-utils.js");
$oP->add_linked_script("../js/wizardhelper.js");
@@ -1381,132 +1382,7 @@ EOF
$oObj = MetaModel::GetObject($sClass, $id, false);
if ($oObj != null)
{
- $aTransitions = $oObj->EnumTransitions();
- $aStimuli = MetaModel::EnumStimuli($sClass);
- if (!isset($aTransitions[$sStimulus]))
- {
- // Invalid stimulus
- throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus, $oObj->GetName(), $oObj->GetStateLabel()));
- }
- $sActionLabel = $aStimuli[$sStimulus]->GetLabel();
- $sActionDetails = $aStimuli[$sStimulus]->GetDescription();
- $aTransition = $aTransitions[$sStimulus];
- $sTargetState = $aTransition['target_state'];
- $aTargetStates = MetaModel::EnumStates($sClass);
- $oP->add("\n");
- $aTargetState = $aTargetStates[$sTargetState];
- $aExpectedAttributes = $aTargetState['attribute_list'];
- $oP->add("$sActionDetails
\n");
- $sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
- if ($sButtonsPosition == 'bottom')
- {
- // bottom: Displays the ticket details BEFORE the actions
- $oP->add('');
- $oObj->DisplayBareProperties($oP);
- $oP->add('
');
- }
- $oP->add("\n");
- $oP->add("
\n");
- $oP->add("
');
- $oObj->DisplayBareProperties($oP);
- $oP->add('
');
- }
-
- $iFieldsCount = count($aFieldsMap);
- $sJsonFieldsMap = json_encode($aFieldsMap);
-
- $oP->add_script(
-<<add_ready_script(
-<<DisplayStimulusForm($oP, $sStimulus);
}
else
{
@@ -1533,6 +1409,7 @@ EOF
$aStimuli = MetaModel::EnumStimuli($sClass);
$sMessage = '';
$sSeverity = 'ok';
+ $bDisplayDetails = true;
if (!isset($aTransitions[$sStimulus]))
{
throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus, $oObj->GetName(), $oObj->GetStateLabel()));
@@ -1568,20 +1445,52 @@ EOF
}
}
- $oObj->UpdateObjectFromPostedForm('', array_keys($aExpectedAttributes), $sTargetState);
+ $oObj->UpdateObjectFromPostedForm('', array_keys($aExpectedAttributes), $sTargetState);
if (count($aErrors) == 0)
{
- if ($oObj->ApplyStimulus($sStimulus))
+ $sIssues = '';
+ $bApplyStimulus = true;
+ list($bRes, $aIssues) = $oObj->CheckToWrite(); // Check before trying to write the object
+ if ($bRes)
{
- $oObj->DBUpdate();
- $sMessage = Dict::Format('UI:Class_Object_Updated', MetaModel::GetName(get_class($oObj)), $oObj->GetName());
- $sSeverity = 'ok';
+ try
+ {
+ $bApplyStimulus = $oObj->ApplyStimulus($sStimulus); // will write the object in the DB
+ }
+ catch(CoreException $e)
+ {
+ // Rollback to the previous state... by reloading the object from the database and applying the modifications again
+ $oObj = MetaModel::GetObject(get_class($oObj), $oObj->GetKey());
+ $oObj->UpdateObjectFromPostedForm('', array_keys($aExpectedAttributes), $sTargetState);
+ $aData = $e->getContextData();
+ $sIssues = (array_key_exists('issues', $aData)) ? $aData['issues'] : 'Unknown error...';
+ }
}
else
+ {
+ $sIssues = implode(' ', $aIssues);
+ }
+
+ if (!$bApplyStimulus)
{
$sMessage = Dict::S('UI:FailedToApplyStimuli');
- $sSeverity = 'error';
+ $sSeverity = 'error';
+ }
+ else if ($sIssues != '')
+ {
+ $bDisplayDetails = false;
+ // Found issues, explain and give the user a second chance
+ //
+ $oObj->DisplayStimulusForm($oP, $sStimulus);
+ $sIssueDesc = Dict::Format('UI:ObjectCouldNotBeWritten',$sIssues);
+ $oP->add_ready_script("alert('".addslashes($sIssueDesc)."');");
+ }
+ else
+ {
+ $sMessage = Dict::Format('UI:Class_Object_Updated', MetaModel::GetName(get_class($oObj)), $oObj->GetName());
+ $sSeverity = 'ok';
+ utils::RemoveTransaction($sTransactionId);
}
}
else
@@ -1590,7 +1499,10 @@ EOF
$sSeverity = 'error';
}
}
- ReloadAndDisplay($oP, $oObj, 'apply_stimulus', $sMessage, $sSeverity);
+ if ($bDisplayDetails)
+ {
+ ReloadAndDisplay($oP, $oObj, 'apply_stimulus', $sMessage, $sSeverity);
+ }
}
else
{