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

Fixed a bug when using a hierarchy of locations, since locatins genreally depends on the object's organization

Browse Source 
SVN:trunk[1385]
This commit is contained in:
Denis Flaven
2011-07-29 10:09:14 +00:00
parent ff89c4d424
commit ca9f17d6e1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/ui.extkeywidget.class.inc.php
View File

@@ -336,7 +336,7 @@ EOF
/**
* Display the hierarchy of the 'target' class
*/
public function DisplayHierarchy(WebPage $oPage, $sFilter, $currValue)
public function DisplayHierarchy(WebPage $oPage, $sFilter, $currValue, $oObj)
{
$sDialogTitle = addslashes(Dict::Format('UI:HierarchyOf_Class', MetaModel::GetName($this->sTargetClass)));
$oPage->add('<div id="dlg_tree_'.$this->iId.'"><div class="wizContainer" style="vertical-align:top;"><div style="overflow:auto;background:#fff;margin-bottom:5px;" id="tree_'.$this->iId.'">');
@@ -348,7 +348,7 @@ EOF
try
{
$oFilter = DBObjectSearch::FromOQL($sFilter);
$oSet = new DBObjectSet($oFilter);
$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj));
}
catch(MissingQueryArgument $e)
{

2
pages/ajax.render.php
View File

@@ -278,7 +278,7 @@ try
$oObj = null;
}
$oWidget = new UIExtKeyWidget($sTargetClass, $sInputId);
$oWidget->DisplayHierarchy($oPage, $sFilter, $currValue);
$oWidget->DisplayHierarchy($oPage, $sFilter, $currValue, $oObj);
break;
////////////////////////////////////////////////////