IDEMPIERE-5679 - Fixing problem using List Type reference on info window columns (#1790)
This commit is contained in:
parent
3a01dc8aa9
commit
1a6ca9a7c3
|
@ -38,6 +38,7 @@ import org.compiere.model.MStyle;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Evaluatee;
|
import org.compiere.util.Evaluatee;
|
||||||
import org.compiere.util.KeyNamePair;
|
import org.compiere.util.KeyNamePair;
|
||||||
|
import org.compiere.util.ValueNamePair;
|
||||||
import org.zkoss.zhtml.Text;
|
import org.zkoss.zhtml.Text;
|
||||||
import org.zkoss.zk.ui.HtmlBasedComponent;
|
import org.zkoss.zk.ui.HtmlBasedComponent;
|
||||||
import org.zkoss.zul.Listcell;
|
import org.zkoss.zul.Listcell;
|
||||||
|
@ -124,6 +125,11 @@ public class WInfoWindowListItemRenderer extends WListItemRenderer
|
||||||
KeyNamePair knp = (KeyNamePair)value;
|
KeyNamePair knp = (KeyNamePair)value;
|
||||||
value = knp.getKey();
|
value = knp.getKey();
|
||||||
}
|
}
|
||||||
|
else if(value instanceof ValueNamePair)
|
||||||
|
{
|
||||||
|
ValueNamePair vnp = (ValueNamePair)value;
|
||||||
|
value = vnp.getValue();
|
||||||
|
}
|
||||||
|
|
||||||
editor.setValue(value);
|
editor.setValue(value);
|
||||||
|
|
||||||
|
|
|
@ -2629,6 +2629,13 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
|
||||||
parameters.add(knpData.getKey());
|
parameters.add(knpData.getKey());
|
||||||
parameters.add(null);
|
parameters.add(null);
|
||||||
}
|
}
|
||||||
|
else if(data instanceof ValueNamePair)
|
||||||
|
{
|
||||||
|
ValueNamePair vnp = (ValueNamePair)data;
|
||||||
|
parameters.add(vnp.getValue());
|
||||||
|
parameters.add(null);
|
||||||
|
parameters.add(null);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
parameters.add(data);
|
parameters.add(data);
|
||||||
|
|
Loading…
Reference in New Issue