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

Regression when fixing bug #89: the "state" attribute was editable. This is now fixed.

Browse Source 
SVN:trunk[320]
This commit is contained in:
Denis Flaven
2010-03-26 16:40:58 +00:00
parent 12d0c865c2
commit 735cd28dfd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/uiwizard.class.inc.php
View File

@@ -145,13 +145,15 @@ $sJSHandlerCode
$aFieldsDone = array(); // Store all the fields that are already covered by a previous step of the wizard $aFieldsDone = array(); // Store all the fields that are already covered by a previous step of the wizard
$aStates = MetaModel::EnumStates($this->m_sClass); $aStates = MetaModel::EnumStates($this->m_sClass);
$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
$aMandatoryAttributes = array(); $aMandatoryAttributes = array();
// Some attributes are always mandatory independently of the state machine (if any) // Some attributes are always mandatory independently of the state machine (if any)
foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode) foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
{ {
$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode); $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed()) if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() &&
($sAttCode != 'finalclass') && ($sAttCode != $sStateAttCode) )
{ {
$aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY; $aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY;
} }
@@ -231,7 +233,6 @@ $sJSHandlerCode
// Now computes the steps to fill the optional fields // Now computes the steps to fill the optional fields
$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
$aFields = array(); // reset $aFields = array(); // reset
foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef) foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
{ {