Fix groupBy bug on captions

Author: jcheron

Ajax/semantic/html/collections/menus/HtmlMenu.php

@@ -53,7 +53,7 @@ public function setActiveItem($index) {
 	}
 
 	private function getItemToInsert($item) {
-		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) {
+		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel || $item instanceof HtmlDropdown) {
 			$itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item);
 			$itemO->addClass("no-active");
 			$item=$itemO;
@@ -241,6 +241,6 @@ public function run(JsUtils $js){
 		if($this->identifier!=="" && !isset($this->_bsComponent))
 			$this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false);
 		$result= parent::run($js);
-		return $result->setItemSelector(".item");
+		return $result->setItemSelector(">.item");
 	}
 }

Ajax/semantic/html/modules/HtmlDropdown.php

@@ -287,6 +287,7 @@ public function asSearch($name=NULL,$multiple=false,$selection=true){
 	}
 
 	public function setSelect($name=NULL,$multiple=false){
+		$this->_template='<%tagName% id="%identifier%" %properties%>%items%</%tagName%>';
 		if(!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;

Ajax/semantic/widgets/base/InstanceViewer.php

@@ -3,6 +3,7 @@
 use Ajax\service\JString;
 use Ajax\service\JArray;
 use Ajax\service\JReflection;
+use Ubiquity\utils\base\UArray;
 
 class InstanceViewer {
 	protected $widgetIdentifier;
@@ -312,29 +313,26 @@ public function getCaption($index){
 
 	public function getCaptions(){
 		$hasGroupby=is_array($this->groupByFields);
-		$count=$this->count()-$this->getGroupByFieldsCount();
+		$count=$this->count();
+		$moreAdded=false;
 		if(isset($this->captions)){
 			$captions= \array_values($this->captions);
+			$gbSize=$hasGroupby?sizeof($this->groupByFields):0;
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$count;$i++){
+			for($i=$captionsSize;$i<$count-$gbSize;$i++){
 				$captions[]="";
+				$moreAdded=true;
 			}
 		}else{
 			$captions=[];
 			$index=0;
-			if(!$hasGroupby){
-				while($index<$count){
-						$captions[]=$this->getCaption($index++);
-				}
-			}else{
-				while($index<$count){
-					if($hasGroupby && array_search($index, $this->groupByFields)===false){
-						$captions[]=$this->getCaption($index);
-					}
-					$index++;
-				}
+			while($index<$count){
+					$captions[]=$this->getCaption($index++);
 			}
 		}
+		if($hasGroupby && sizeof($captions)>=$count && !$moreAdded){
+			$captions=UArray::removeByKeys($captions, $this->groupByFields);
+		}
 		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
 			$callback=$this->captionCallback;
 			$callback($captions,$this->instance);