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

- Fixed the display of "Notifications"

Browse Source 
- Rolled back, not to display menus on linkedset when not in edition mode

SVN:trunk[775]
This commit is contained in:
Denis Flaven
2010-09-06 09:09:31 +00:00
parent 8f982bc5bd
commit e965ba71b9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@ abstract class cmdbAbstractObject extends CMDBObject
$aParams = array(
'target_attr' => $oAttDef->GetExtKeyToMe(),
'object_id' => $this->GetKey(),
'menu' => true,
'menu' => false,
'default' => $aDefaults,
);
}
@@ -240,7 +240,7 @@ abstract class cmdbAbstractObject extends CMDBObject
'object_id' => $this->GetKey(),
'target_attr' => $oAttDef->GetExtKeyToRemote(),
'view_link' => false,
'menu' => true,
'menu' => false,
'display_limit' => true, // By default limit the list to speed up the initial load & display
);
}
@@ -266,8 +266,8 @@ abstract class cmdbAbstractObject extends CMDBObject
// Display notifications regarding the object
$iId = $this->GetKey();
$oNotifSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT EventNotificationEmail AS Ev JOIN TriggerOnObject AS T ON Ev.trigger_id = T.id WHERE T.target_class IN ('$sClassList') AND Ev.object_id = $iId"));
self::DisplaySet($oPage, $oNotifSet);
$oBlock = new DisplayBlock(DBObjectSearch::FromOQL("SELECT EventNotificationEmail AS Ev JOIN TriggerOnObject AS T ON Ev.trigger_id = T.id WHERE T.target_class IN ('$sClassList') AND Ev.object_id = $iId"), 'list', false);
$oBlock->Display($oPage, 'notifications', array());
}
}
}