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

[ 2009486 ] Sales Order Line- Product selection 

[ 2009462 ] "Process Cancelled" Error
[ 2009454 ] Not saved Error Message
[ 2009449 ] Material Transaction Product Selection Button
[ 2009446 ] Grid Toggle option errors - pending on Product Attribute Grid custom form
This commit is contained in:
Heng Sin Low 2008-07-25 10:28:02 +00:00
parent a3239d014b
commit 609c0e2023
7 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
View File

@ -17,7 +17,6 @@
package org.adempiere.webui;
import java.awt.Color;
import java.io.Serializable;
import java.sql.PreparedStatement;
import java.sql.ResultSet;

33
zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -14,12 +14,12 @@ import org.adempiere.webui.session.SessionManager;
import org.compiere.apps.ProcessCtl;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil;
import org.compiere.util.ASyncProcess;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.DesktopUnavailableException;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
@ -56,9 +56,10 @@ import org.zkoss.zul.Html;
* @author arboleda - globalqss
* - Implement ShowHelp option on processes and reports
*/
public class ProcessDialog extends Window implements EventListener, ASyncProcess
public class ProcessDialog extends Window implements EventListener//, ASyncProcess
{
private static final long serialVersionUID = 1L;
/**
* Dialog to start a process/report
* @param ctx
@ -258,7 +259,31 @@ public class ProcessDialog extends Window implements EventListener, ASyncProcess
getDesktop().enableServerPush(true);
this.lockUI(m_pi);
ProcessCtl.process(this, m_WindowNo, parameterPanel, m_pi, null);
Runnable runnable = new Runnable() {
public void run() {
//get full control of desktop
org.zkoss.zk.ui.Desktop desktop = ProcessDialog.this.getDesktop();
try {
Executions.activate(desktop);
} catch (DesktopUnavailableException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
try {
ProcessCtl.process(null, m_WindowNo, parameterPanel, m_pi, null);
} catch(Error ex){
throw ex;
} finally{
unlockUI(m_pi);
//release full control of desktop
Executions.deactivate(desktop);
}
}
};
new Thread(runnable).start();
}
public boolean isAsap() {

3
zkwebui/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
View File

@ -32,6 +32,7 @@ import org.adempiere.webui.editor.WEditor;
import org.adempiere.webui.editor.WebEditorFactory;
import org.adempiere.webui.event.ValueChangeEvent;
import org.adempiere.webui.event.ValueChangeListener;
import org.adempiere.webui.window.FDialog;
import org.compiere.apps.IProcessParameter;
import org.compiere.model.GridField;
import org.compiere.model.GridFieldVO;
@ -329,7 +330,7 @@ implements ValueChangeListener, IProcessParameter
if (sb.length() != 0)
{
//ADialog.error(m_WindowNo, this, "FillMandatory", sb.toString());
FDialog.error(m_WindowNo, this, "FillMandatory", sb.toString());
return false;
}

1
zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WBarGraph.java
View File

@ -349,6 +349,7 @@ public class WBarGraph extends Panel
myImage.appendChild(area);
area.setCoords(ce.getShapeCoords());
area.setShape(ce.getShapeType());
area.setTooltiptext(tooltip);
area.setId("WBG_"+tooltip);
count++;
}

6
zkwebui/WEB-INF/src/org/adempiere/webui/editor/WDateEditor.java
View File

@ -69,7 +69,6 @@ public class WDateEditor extends WEditor
public WDateEditor (String label, String description, boolean mandatory, boolean readonly, boolean updateable)
{
super(new Datebox(), label, description, mandatory, readonly, updateable);
setColumnName("Date");
}
@ -102,7 +101,10 @@ public class WDateEditor extends WEditor
@Override
public Object getValue()
{
return null;
// Elaine 2008/07/25
if(getComponent().getValue() == null) return null;
return new Timestamp(getComponent().getValue().getTime());
//
}
@Override

2
zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
View File

@ -856,6 +856,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
curTab.setQuery(query);
curTabpanel.query(m_onlyCurrentRows, m_onlyCurrentDays, 0); // autoSize
}
curTab.dataRefresh(); // Elaine 2008/07/25
}
public void onIgnore()

2
zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
View File

@ -61,7 +61,7 @@ public class WebUIServlet extends DHtmlLayoutServlet
super.init(servletConfig);
/** Initialise context for the current thread*/
WebContext.setCurrentInstance(new WebContext());
WebContext.setCurrentInstance(new WebContext());
Env.setContextProvider(new ZkContextProvider());
/**