widget Index bug fixed

Author: jcheron

Ajax/common/Widget.php

@@ -197,7 +197,7 @@ public function insertInField($index,$field){
 	/**
 	 * Defines the function which displays the field value
 	 * @param $index index or name of the field to display
-	 * @param callable $callback function parameters are : $value : the field value ,$index : the field index, $instance : the active instance of model
+	 * @param callable $callback function parameters are : $value : the field value, $instance : the active instance of model, $fieldIndex : the field index, $rowIndex : the row index
 	 * @return Widget
 	 */
 	public function setValueFunction($index,$callback){

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -45,7 +45,7 @@ protected function _applyAttributes(BaseHtml $element,&$attributes,$index){
 		if(isset($attributes["jsCallback"])){
 			$callback=$attributes["jsCallback"];
 			if(\is_callable($callback)){
-				$callback($element,$this->_modelInstance,$index);
+				$callback($element,$this->_modelInstance,$index,InstanceViewer::$index);
 				//unset($attributes["jsCallback"]);
 			}
 		}
@@ -81,7 +81,7 @@ protected function _prepareFormFields(HtmlFormField &$field,$name,&$attributes){
 	}
 
 	protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null){
-		$this->setValueFunction($index,function($value,$instance,$index) use (&$attributes,$elementCallback,$prefix){
+		$this->setValueFunction($index,function($value,$instance,$index,$rowIndex) use (&$attributes,$elementCallback,$prefix){
 			$caption=$this->_getFieldCaption($index);
 			$name=$this->_getFieldName($index);
 			$id=$this->_getFieldIdentifier($prefix,$name);

Ajax/semantic/widgets/base/InstanceViewer.php

@@ -117,13 +117,13 @@ protected function _getValue($property,$index){
 
 	protected function _postGetValue($index,$propertyName,$value){
 		if(isset($this->values[$index])){
-			$value= $this->values[$index]($value,$this->instance,$index);
+			$value= $this->values[$index]($value,$this->instance,$index,self::$index);
 		}else{
-			$value=$this->_getDefaultValue($propertyName,$value, $index);
+			$value=$this->_getDefaultValue($propertyName,$value, self::$index);
 		}
 		if(isset($this->afterCompile[$index])){
 			if(\is_callable($this->afterCompile[$index])){
-				$this->afterCompile[$index]($value,$this->instance,$index);
+				$this->afterCompile[$index]($value,$this->instance,self::$index);
 			}
 		}
 		return $value;