Pārlūkot izejas kodu

Pass the final class to GetShortcutActions

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1498 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 13 gadi atpakaļ
vecāks
revīzija
90101d71bb

+ 3 - 1
application/cmdbabstract.class.inc.php

@@ -2146,8 +2146,10 @@ EOF
 	
 	/**
 	 * Get the list of actions to be displayed as 'shortcuts' (i.e buttons) instead of inside the Actions popup menu
+	 * @param $sFinalClass string The actual class of the objects for which to display the menu
+	 * @return Array the list of menu codes (i.e dictionary entries) that can be displayed as shortcuts next to the actions menu
 	 */
-	 public static function GetShortcutActions()
+	 public static function GetShortcutActions($sFinalClass)
 	 {
 	 	return array('UI:Menu:New', 'UI:Menu:Modify');
 	 }

+ 1 - 2
application/displayblock.class.inc.php

@@ -1228,9 +1228,8 @@ class MenuBlock extends DisplayBlock
 			}
 		}
 		$aFavoriteActions = array();
-		$aFavorites = array('UI:Menu:Modify', 'UI:Menu:New', /*'UI:Menu:Delete'*/);
 		$aCallSpec = array($sClass, 'GetShortcutActions');
-		$aShortcutActions = call_user_func($aCallSpec);
+		$aShortcutActions = call_user_func($aCallSpec, $sClass);
 		foreach ($aActions as $key => $aAction)
 		{
 			if (in_array($key, $aShortcutActions))