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

IDEMPIERE-2531 Archive Viewer open EnterQuery tab instead of ViewResult / IDEMPIERE-556 / IDEMPIERE-724

This commit is contained in:
Carlos Ruiz 2015-04-08 16:01:59 -05:00
parent c2c4bd8215
commit 9fee5d028e
2 changed files with 24 additions and 10 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/WArchive.java
View File

@ -133,7 +133,7 @@ public class WArchive implements EventListener<Event>
if (allReports > 0) if (allReports > 0)
{ {
m_reportsAll = new Menuitem(Msg.getMsg(Env.getCtx(), "ArchivedReportsAll") m_reportsAll = new Menuitem(Msg.getMsg(Env.getCtx(), "ArchivedReportsAll")
+ " (" + reportCount + ")"); + " (" + allReports + ")");
m_reportsAll.addEventListener(Events.ON_CLICK, this); m_reportsAll.addEventListener(Events.ON_CLICK, this);
m_popup.appendChild(m_reportsAll); m_popup.appendChild(m_reportsAll);
} }

32
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
View File

@ -64,6 +64,7 @@ import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util; import org.compiere.util.Util;
import org.zkoss.util.media.AMedia; import org.zkoss.util.media.AMedia;
import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
@ -133,15 +134,25 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
{ {
log.info(""); log.info("");
form = new CustomForm(); form = new CustomForm() {
try { private static final long serialVersionUID = 7226661630651936293L;
dynInit();
jbInit(); @Override
} public void onPageAttached(Page newpage, Page oldpage) {
catch(Exception e) super.onPageAttached(newpage, oldpage);
{ if (newpage != null)
log.log(Level.SEVERE, "init", e); try {
} dynInit();
jbInit();
}
catch(Exception e)
{
log.log(Level.SEVERE, "init", e);
}
}
};
m_WindowNo = form.getWindowNo(); m_WindowNo = form.getWindowNo();
} }
@ -511,6 +522,9 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
*/ */
private void updateQDisplay() private void updateQDisplay()
{ {
if (!showQuery)
return;
boolean reports = reportField.isChecked(); boolean reports = reportField.isChecked();
if (log.isLoggable(Level.CONFIG)) log.config("Reports=" + reports); if (log.isLoggable(Level.CONFIG)) log.config("Reports=" + reports);