浏览代码

Added <inherit_flags_from> to inherit the flags from another state.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3296 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 10 年之前
父节点
当前提交
3e37eac522
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      setup/compiler.class.inc.php

+ 1 - 2
setup/compiler.class.inc.php

@@ -1093,8 +1093,7 @@ EOF;
 				$sLifecycle .= "		MetaModel::Init_DefineState(\n";
 				$sLifecycle .= "		MetaModel::Init_DefineState(\n";
 				$sLifecycle .= "			\"".$sState."\",\n";
 				$sLifecycle .= "			\"".$sState."\",\n";
 				$sLifecycle .= "			array(\n";
 				$sLifecycle .= "			array(\n";
-				$sAttributeInherit = '';
-				//$sAttributeInherit = $oState->GetChildText('inherit_flags', ''); // Seems easy but think about the consequences when applying a delta
+				$sAttributeInherit = $oState->GetChildText('inherit_flags_from', '');
 				$sLifecycle .= "				\"attribute_inherit\" => '$sAttributeInherit',\n";
 				$sLifecycle .= "				\"attribute_inherit\" => '$sAttributeInherit',\n";
 				$oHighlight = $oState->GetUniqueElement('highlight', false);
 				$oHighlight = $oState->GetUniqueElement('highlight', false);
 				if ($oHighlight)
 				if ($oHighlight)