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

hg merge release-2.0 (merge release2 into development)

This commit is contained in:
Carlos Ruiz 2014-07-23 13:02:55 -05:00
parent 9d8b8e11b7 53c142a32c
commit d50ba20b8d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
View File

@ -353,7 +353,7 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
return "images/mWindow.png"; return "images/mWindow.png";
if (mt.isReport()) if (mt.isReport())
return "images/mReport.png"; return "images/mReport.png";
if (mt.isProcess()) if (mt.isProcess() || mt.isTask())
return "images/mProcess.png"; return "images/mProcess.png";
if (mt.isWorkFlow()) if (mt.isWorkFlow())
return "images/mWorkFlow.png"; return "images/mWorkFlow.png";

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTask.java
View File

@ -37,9 +37,9 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.South;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Html; import org.zkoss.zul.Html;
import org.zkoss.zul.South;
/** /**
* Application Task * Application Task
@ -96,7 +96,14 @@ public class WTask extends Window implements EventListener<Event>, IHelpContext
SessionManager.getAppDesktop().showWindow(this); SessionManager.getAppDesktop().showWindow(this);
Events.echoEvent("executeTask", this, null); addEventListener("onExecuteTask", new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
executeTask();
}
});
Events.echoEvent("onExecuteTask", this, null);
} }
catch(Exception e) catch(Exception e)
{ {
@ -204,7 +211,7 @@ public class WTask extends Window implements EventListener<Event>, IHelpContext
taskThread.interrupt(); taskThread.interrupt();
else if (e.getName().equals(WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT)) else if (e.getName().equals(WindowContainer.ON_WINDOW_CONTAINER_SELECTION_CHANGED_EVENT))
SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Task, m_task.getAD_Task_ID()); SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Task, m_task.getAD_Task_ID());
else if (e.getName().equals(Events.ON_CLICK))
SessionManager.getAppDesktop().closeActiveWindow(); SessionManager.getAppDesktop().closeActiveWindow();
} // actionPerformed } // actionPerformed