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

- improved handling of the 'menu' parameter (Thanks to david-alves for reporting it)

Browse Source 
- removed unneeded paragraph marks around the h2 title for a better HTMl formatting.

SVN:trunk[197]
This commit is contained in:
Denis Flaven
2009-11-03 19:03:34 +00:00
parent b2a9de9d59
commit d7b3bea8f4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pages/UI.php
View File

@@ -8,7 +8,7 @@ require_once('../application/startup.inc.php');
$oContext = new UserContext();
$oAppContext = new ApplicationContext();
$iActiveNodeId = utils::ReadParam('menu', '');
if (empty($iActiveNodeId))
if (empty($iActiveNodeId) && !is_numeric($iActiveNodeId))
{
// No menu specified, let's get the default one:
// 1) It's a root menu item (parent_id == 0)
@@ -319,7 +319,7 @@ switch($operation)
$oWizard = new UIWizard($oP, $sClass, $sStateCode);
$sStateCode = $oWizard->GetTargetState(); // Will computes the default state if none was supplied
$sClassLabel = MetaModel::GetName($sClass);
$oP->p("<h2>Creation of a new $sClassLabel</h2>");
$oP->add("<h2>Creation of a new $sClassLabel</h2>");
if (!empty($sStateCode))
{
$aStates = MetaModel::EnumStates($sClass);
@@ -1092,7 +1092,10 @@ switch($operation)
break;
default:
$oActiveNode->RenderContent($oP, $oAppContext->GetAsHash());
if (is_object($oActiveNode))
{
$oActiveNode->RenderContent($oP, $oAppContext->GetAsHash());
}
}
////MetaModel::ShowQueryTrace();
$oP->output();