N°587 - Portal: Fixed issue when using multiple action rules in a BrowseBrick and only one was actually used.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4556 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php

@@ -554,25 +554,25 @@ class BrowseBrickController extends BrickController
 		}
 	}
 
-	/**
-	 * Prepares the action rules for an $oItem. Action rules are used to defined some iTopObjectCopier rules that will be apply to an DBObject created from $oItem
-	 *
-	 * @param DBObject $oItem
-	 * @param string $sLevelsAlias
-	 * @param array $aLevelsProperties
-	 * @return array
-	 */
-	public static function PrepareActionRulesForItem(DBObject $oItem, $sLevelsAlias, array &$aLevelsProperties)
-	{
-		$aActionRules = array();
-
-		foreach ($aLevelsProperties[$sLevelsAlias]['actions'] as $sId => $aAction)
-		{
-			$aActionRules[$sId] = ContextManipulatorHelper::EncodeRulesToken($aAction['rules'], array($oItem));
-		}
-
-		return $aActionRules;
-	}
+    /**
+     * Prepares the action rules for an array of DBObject items.
+     *
+     * @param array $aItems
+     * @param string $sLevelsAlias
+     * @param array $aLevelsProperties
+     * @return array
+     */
+	public static function PrepareActionRulesForItems(array $aItems, $sLevelsAlias, array &$aLevelsProperties)
+    {
+        $aActionRules = array();
+
+        foreach ($aLevelsProperties[$sLevelsAlias]['actions'] as $sId => $aAction)
+        {
+            $aActionRules[$sId] = ContextManipulatorHelper::PrepareAndEncodeRulesToken($aAction['rules'], $aItems);
+        }
+
+        return $aActionRules;
+    }
 
 	/**
 	 * Takes $aCurrentRow as a flat array and transform it in another flat array (not objects) with only the necessary informations
@@ -602,12 +602,15 @@ class BrowseBrickController extends BrickController
 
 		foreach ($aCurrentRow as $key => $value)
 		{
+		    // Retrieving objects from all levels
+		    $aItems = array_values($aCurrentRow);
+
 			$aRow[$key] = array(
 				'level_alias' => $key,
 				'id' => $value->GetKey(),
 				'name' => $value->Get($aLevelsProperties[$key]['name_att']),
 				'class' => get_class($value),
-				'action_rules_token' => static::PrepareActionRulesForItem($value, $key, $aLevelsProperties)
+				'action_rules_token' => static::PrepareActionRulesForItems($aItems, $key, $aLevelsProperties)
 			);
 
 			// Adding tooltip attribute if necessary
@@ -660,12 +663,19 @@ class BrowseBrickController extends BrickController
 	 * @param array $aCurrentRow
 	 * @param array $aLevelsProperties
 	 */
-	public static function AddToTreeItems(array &$aItems, array $aCurrentRow, array &$aLevelsProperties)
+	public static function AddToTreeItems(array &$aItems, array $aCurrentRow, array &$aLevelsProperties, $aCurrentRowObjects = null)
 	{
 		$aCurrentRowKeys = array_keys($aCurrentRow);
 		$aCurrentRowValues = array_values($aCurrentRow);
 		$sCurrentIndex = $aCurrentRowKeys[0] . '::' . $aCurrentRowValues[0]->GetKey();
 
+		// We make sure to keep all row objects through levels by copying them when processing the first level.
+        // Otherwise they will be sliced through levels, one by one.
+		if($aCurrentRowObjects === null)
+        {
+            $aCurrentRowObjects = $aCurrentRowValues;
+        }
+
 		if (!isset($aItems[$sCurrentIndex]))
 		{
 			$aItems[$sCurrentIndex] = array(
@@ -674,7 +684,7 @@ class BrowseBrickController extends BrickController
 				'name' => $aCurrentRowValues[0]->Get($aLevelsProperties[$aCurrentRowKeys[0]]['name_att']),
 				'class' => get_class($aCurrentRowValues[0]),
 				'subitems' => array(),
-				'action_rules_token' => static::PrepareActionRulesForItem($aCurrentRowValues[0], $aCurrentRowKeys[0], $aLevelsProperties)
+				'action_rules_token' => static::PrepareActionRulesForItems($aCurrentRowObjects, $aCurrentRowKeys[0], $aLevelsProperties)
 			);
 
 			if ($aLevelsProperties[$aCurrentRowKeys[0]]['tooltip_att'] !== null)
@@ -686,7 +696,7 @@ class BrowseBrickController extends BrickController
 		$aCurrentRowSliced = array_slice($aCurrentRow, 1);
 		if (!empty($aCurrentRowSliced))
 		{
-			static::AddToTreeItems($aItems[$sCurrentIndex]['subitems'], $aCurrentRowSliced, $aLevelsProperties);
+			static::AddToTreeItems($aItems[$sCurrentIndex]['subitems'], $aCurrentRowSliced, $aLevelsProperties, $aCurrentRowObjects);
 		}
 	}
 

datamodels/2.x/itop-portal-base/portal/src/helpers/contextmanipulatorhelper.class.inc.php

@@ -400,6 +400,31 @@ class ContextManipulatorHelper
 		return $aResults;
 	}
 
+    /**
+     * Prepares the rules as an array of rules and source objects so it can be tokenised
+     *
+     * @param array $aRules
+     * @param array $aObjects
+     * @return array
+     */
+	public static function PrepareRulesForToken($aRules, $aObjects = array())
+    {
+        // Getting necessary information from objects
+        $aSources = array();
+        foreach ($aObjects as $oObject)
+        {
+            $aSources[get_class($oObject)] = $oObject->GetKey();
+        }
+
+        // Preparing data
+        $aTokenRules = array(
+            'rules' => $aRules,
+            'sources' => $aSources
+        );
+
+        return $aTokenRules;
+    }
+
 	/**
 	 * Encodes a token made out of the rules.
 	 *
@@ -411,32 +436,33 @@ class ContextManipulatorHelper
 	 * @param array $aObjects
 	 * @return string
 	 */
-	static public function EncodeRulesToken($aRules, $aObjects = array())
+	public static function EncodeRulesToken($aTokenRules)
 	{
-		// Getting necessary information from objects
-		$aSources = array();
-		foreach ($aObjects as $oObject)
-		{
-			$aSources[get_class($oObject)] = $oObject->GetKey();
-		}
-
-		// Preparing data
-		$aTokenRules = array(
-			'rules' => $aRules,
-			'sources' => $aSources
-		);
-
-		// Returning tokenised data
+	    // Returning tokenised data
 		return base64_encode(json_encode($aTokenRules));
 	}
 
+    /**
+     * @param array $aRules
+     * @param array $aObjects
+     * @return string
+     */
+	public static function PrepareAndEncodeRulesToken($aRules, $aObjects = array())
+    {
+        // Preparing rules before making a token
+        $aTokenRules = static::PrepareRulesForToken($aRules, $aObjects);
+
+        // Returning tokenised data
+        return static::EncodeRulesToken($aTokenRules);
+    }
+
 	/**
 	 * Decodes a token made out of the rules
 	 *
 	 * @param string $sToken
 	 * @return array
 	 */
-	static public function DecodeRulesToken($sToken)
+	public static function DecodeRulesToken($sToken)
 	{
 		return json_decode(base64_decode($sToken), true);
 	}