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

IDEMPIERE-1457 Bug in Calendar - java.lang.NullPointerException (based on patch from hieplq)

This commit is contained in:
Carlos Ruiz 2013-10-23 09:00:54 -05:00
parent 08f6df1992
commit b051da0bef
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Tabpanel.java
View File

@ -75,10 +75,10 @@ public class Tabpanel extends org.zkoss.zul.Tabpanel implements IdSpace
public void onClose() { public void onClose() {
if (onCloseHandler != null) if (onCloseHandler != null)
onCloseHandler.onClose(this); onCloseHandler.onClose(this);
else {
Tab tab = this.getLinkedTab(); Tab tab = this.getLinkedTab();
if (tab != null)
tab.close(); tab.close();
}
} }
public void setOnCloseHandler(ITabOnCloseHandler handler) { public void setOnCloseHandler(ITabOnCloseHandler handler) {

23
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java
View File

@ -30,7 +30,9 @@ import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.TimeZone; import java.util.TimeZone;
import org.adempiere.webui.component.Tabpanel;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.ITabOnCloseHandler;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
@ -72,12 +74,12 @@ import org.zkoss.zul.Toolbarbutton;
* @author Elaine * @author Elaine
* *
*/ */
public class CalendarWindow extends Window implements EventListener<Event> { public class CalendarWindow extends Window implements EventListener<Event>, ITabOnCloseHandler {
/** /**
* *
*/ */
private static final long serialVersionUID = 5620139733919619691L; private static final long serialVersionUID = 1576992746053720647L;
private Calendars calendars; private Calendars calendars;
private SimpleCalendarModel scm; private SimpleCalendarModel scm;
private Toolbarbutton btnRefresh; private Toolbarbutton btnRefresh;
@ -185,6 +187,17 @@ public class CalendarWindow extends Window implements EventListener<Event> {
calendars.addEventListener("onMouseOver", this); calendars.addEventListener("onMouseOver", this);
SessionManager.getAppDesktop().showWindow(this); SessionManager.getAppDesktop().showWindow(this);
// IDEMPIERE-1457: when show this window on tab, handle event close to remove calendars away scm
Component parentTab = this.getParent();
if (parentTab != null && parentTab.getClass().equals(Tabpanel.class)) {
((Tabpanel)parentTab).setOnCloseHandler(this);
}
}
public void onClose(Tabpanel tabPanel){
//IDEMPIERE-1457: On close, remove calendars away scm
calendars.setModel(null);
} }
public void onEvent(Event e) throws Exception { public void onEvent(Event e) throws Exception {
@ -231,7 +244,7 @@ public class CalendarWindow extends Window implements EventListener<Event> {
ArrayList<ADCalendarEvent> events = DPCalendar.getEvents(R_RequestType_ID, Env.getCtx()); ArrayList<ADCalendarEvent> events = DPCalendar.getEvents(R_RequestType_ID, Env.getCtx());
for (ADCalendarEvent event : events) for (ADCalendarEvent event : events)
scm.add(event); scm.add(event);
calendars.setModel(scm);
calendars.invalidate(); calendars.invalidate();
syncModel(); syncModel();
} }
@ -368,7 +381,7 @@ public class CalendarWindow extends Window implements EventListener<Event> {
ArrayList<ADCalendarEvent> events = DPCalendar.getEvents(R_RequestType_ID, Env.getCtx()); ArrayList<ADCalendarEvent> events = DPCalendar.getEvents(R_RequestType_ID, Env.getCtx());
for (ADCalendarEvent event : events) for (ADCalendarEvent event : events)
scm.add(event); scm.add(event);
calendars.setModel(scm);
calendars.invalidate(); calendars.invalidate();
syncModel(); syncModel();
} }

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPCalendar.java
View File

@ -373,10 +373,15 @@ public class DPCalendar extends DashboardPanel implements EventListener<Event>,
@Override @Override
public void updateUI() { public void updateUI() {
scm = new SimpleCalendarModel(); if (scm == null) {
scm = new SimpleCalendarModel();
calendars.setModel(scm);
}
scm.clear();
for (ADCalendarEvent event : events) for (ADCalendarEvent event : events)
scm.add(event); scm.add(event);
calendars.setModel(scm);
calendars.invalidate(); calendars.invalidate();
} }