midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1241 problem with advanced search colum posted

This commit is contained in:
Juliana Corredor 2013-08-05 13:16:51 -05:00
parent 19661cd254
commit bd6236850d
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -62,6 +62,7 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.editor.WEditor; import org.adempiere.webui.editor.WEditor;
import org.adempiere.webui.editor.WNumberEditor; import org.adempiere.webui.editor.WNumberEditor;
import org.adempiere.webui.editor.WStringEditor; import org.adempiere.webui.editor.WStringEditor;
import org.adempiere.webui.editor.WTableDirEditor;
import org.adempiere.webui.editor.WebEditorFactory; import org.adempiere.webui.editor.WebEditorFactory;
import org.adempiere.webui.event.DialogEvents; import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.event.ValueChangeEvent; import org.adempiere.webui.event.ValueChangeEvent;
@ -73,7 +74,9 @@ import org.compiere.model.GridField;
import org.compiere.model.GridFieldVO; import org.compiere.model.GridFieldVO;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory; import org.compiere.model.MLookupFactory;
import org.compiere.model.MLookupInfo;
import org.compiere.model.MProduct; import org.compiere.model.MProduct;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
@ -1663,18 +1666,24 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
{ {
editor = new WNumberEditor(findField); editor = new WNumberEditor(findField);
} }
else if (findField.getDisplayType() == DisplayType.Button) else if (findField.getDisplayType() == DisplayType.Button)
{ {
if (columnName.endsWith("_ID")) if (findField.getAD_Reference_Value_ID() > 0) {
{ MLookupInfo info = MLookupFactory.getLookup_List(Env.getLanguage(Env.getCtx()), findField.getAD_Reference_Value_ID());
editor = new WNumberEditor(findField); MLookup mLookup = new MLookup(info, 0);
} else { editor = new WTableDirEditor(columnName, false,false, true, mLookup);
editor = new WStringEditor(findField); findField.addPropertyChangeListener(editor);
}
} else {
if (columnName.endsWith("_ID")) {
editor = new WNumberEditor(findField);
} else {
editor = new WStringEditor(findField);
}
}
} }
else else
{ {
//reload lookupinfo for find window //reload lookupinfo for find window
if (DisplayType.isLookup(findField.getDisplayType()) ) if (DisplayType.isLookup(findField.getDisplayType()) )
{ {