Merge pull request #3242 from jeedom/fix/history-range-with-grouping

implode groupingType if is array

Author: Salvialf

core/ajax/cmd.ajax.php

@@ -246,12 +246,12 @@
 	}
 
 	if (init('action') == 'byEqLogic') {
-        if (init('typeCmd')) {
-            ajax::success(utils::o2a(cmd::byEqLogicId(init('eqLogic_id'), init('typeCmd'))));
-        } else {
-            ajax::success(utils::o2a(cmd::byEqLogicId(init('eqLogic_id'))));
-        }
-     }
+		if (init('typeCmd')) {
+			ajax::success(utils::o2a(cmd::byEqLogicId(init('eqLogic_id'), init('typeCmd'))));
+		} else {
+			ajax::success(utils::o2a(cmd::byEqLogicId(init('eqLogic_id'))));
+		}
+	}
 
 	if (init('action') == 'getCmd') {
 		$cmd = cmd::byId(init('id'));
@@ -422,6 +422,13 @@
 			}
 			$return['derive'] = $derive;
 			$groupingType = init('groupingType');
+			if (is_array($groupingType)) {
+				if (isset($groupingType['function']) && isset($groupingType['time'])) {
+					$groupingType = $groupingType['function'] . '::' . $groupingType['time'];
+				} else {
+					$groupingType = implode('::', array_values($groupingType));
+				}
+			}
 			if ($groupingType == '') {
 				$groupingType = $cmd->getDisplay('groupingType');
 			}
@@ -497,7 +504,7 @@
 	if (init('action') == 'getLastHistory') {
 		$cmd = cmd::byId(init('id'));
 		$_time = date('Y-m-d H:i:s', strtotime(init('time')));
-		if(is_object($cmd)){
+		if (is_object($cmd)) {
 			ajax::success($cmd->getLastHistory($_time));
 		} else {
 			throw new Exception(__('Nombre maximum de niveaux d’éléments affichés dans les graphiques de liens', __FILE__) . ' ' . init('id'));