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

New data model integration...

Browse Source 
SVN:trunk[497]
This commit is contained in:
Denis Flaven
2010-06-28 14:53:18 +00:00
parent bc4bfed9f8
commit 95dc9bfc1a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,9 +146,12 @@ abstract class cmdbAbstractObject extends CMDBObject
$sTargetClass = $oAttDef->GetLinkedClass();
$oFilter = new DBObjectSearch($sTargetClass);
$oFilter->AddCondition($oAttDef->GetExtKeyToMe(), $this->GetKey());
$oBlock = new DisplayBlock($oFilter, 'list', false);
$oBlock->Display($oPage, 0);
$aParams = array(
'target_attr' => $oAttDef->GetExtKeyToMe(),
'object_id' => $this->GetKey()
);
$oBlock->Display($oPage, 0, $aParams);
}
else // get_class($oAttDef) == 'AttributeLinkedSetIndirect'
{
@@ -904,7 +907,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$sHTMLValue = "<textarea class=\"resizable\" title=\"$sHelpText\" name=\"attr_{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\">$value</textarea>&nbsp;{$sValidationField}";
break;
case 'List':
case 'LinkedSet':
$aEventsList[] ='change';
$oWidget = new UILinksWidget($sClass, $sAttCode, $iId, $sNameSuffix);
$sHTMLValue = $oWidget->Display($oPage, $value);
@@ -925,6 +928,10 @@ abstract class cmdbAbstractObject extends CMDBObject
$sHTMLValue .= "<input title=\"$sHelpText\" name=\"file_{$sAttCode}{$sNameSuffix}\" type=\"file\" id=\"file_$iId\" onChange=\"UpdateFileName('$iId', this.value)\"/>&nbsp;{$sValidationField}\n";
break;
case 'List':
// Not editable for now...
break;
case 'String':
default:
// #@# todo - add context information (depending on dimensions)

2
application/itopwebpage.class.inc.php
View File

@@ -231,7 +231,7 @@ EOF
* Universal Search
*/
$oWelcomeMenu = new MenuGroup('UI:WelcomeMenu', 0 /* fRank */);
new TemplateMenuNode('UI:WelcomeMenu', '../business/templates/welcome_menu.html', $oWelcomeMenu->GetIndex() /* oParent */, 1 /* fRank */);
new TemplateMenuNode('UI:WelcomeMenuPage', '../business/templates/welcome_menu.html', $oWelcomeMenu->GetIndex() /* oParent */, 1 /* fRank */);
$oToolsMenu = new MenuGroup('UI:AdvancedToolsMenu', 2 /* fRank */);
new WebPageMenuNode('UI:CSVImportMenu', '../pages/csvimport.php', $oToolsMenu->GetIndex(), 1 /* fRank */);