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

IDEMPIERE-1328 Change tab name dynamically / implement format and indirect for title logic too (it was working for recent items) / refresh recent item on buttons

This commit is contained in:
Carlos Ruiz 2015-08-18 09:54:00 -05:00
parent 0e0589d8be
commit 023efc0292
1 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -89,6 +89,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRecentItem; import org.compiere.model.MRecentItem;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MWindow; import org.compiere.model.MWindow;
import org.compiere.model.PO;
import org.compiere.model.X_AD_CtxHelp; import org.compiere.model.X_AD_CtxHelp;
import org.compiere.process.DocAction; import org.compiere.process.DocAction;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
@ -1308,6 +1309,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
} }
private String prevdbInfo = "";
/** /**
* @param e * @param e
* @see DataStatusListener#dataStatusChanged(DataStatusEvent) * @see DataStatusListener#dataStatusChanged(DataStatusEvent)
@ -1334,36 +1336,51 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
if (!detailTab) if (!detailTab)
{ {
String dbInfo = e.getMessage(); String dbInfo = e.getMessage();
if (logger.isLoggable(Level.INFO)) logger.info(dbInfo); if (! prevdbInfo.equals(dbInfo)) {
if (adTabbox.getSelectedGridTab() != null && adTabbox.getSelectedGridTab().isQueryActive()) prevdbInfo = dbInfo;
dbInfo = "[ " + dbInfo + " ]"; if (logger.isLoggable(Level.INFO)) logger.info(dbInfo);
breadCrumb.setStatusDB(dbInfo, e); if (adTabbox.getSelectedGridTab() != null && adTabbox.getSelectedGridTab().isQueryActive())
dbInfo = "[ " + dbInfo + " ]";
breadCrumb.setStatusDB(dbInfo, e);
String prefix = null; String prefix = null;
if (dbInfo.contains("*")) if (dbInfo.contains("*"))
prefix = "*"; prefix = "*";
String titleLogic = null; String titleLogic = null;
int windowID = getADTab().getSelectedGridTab().getAD_Window_ID(); int windowID = getADTab().getSelectedGridTab().getAD_Window_ID();
if (windowID > 0) { if (windowID > 0) {
titleLogic = MWindow.get(Env.getCtx(), windowID).getTitleLogic(); titleLogic = MWindow.get(Env.getCtx(), windowID).getTitleLogic();
}
String header = null;
if (! Util.isEmpty(titleLogic)) {
StringBuilder sb = new StringBuilder();
if (prefix != null)
sb.append(prefix);
sb.append(Env.getContext(ctx, curWindowNo, "_WinInfo_WindowName", false)).append(": ");
if (titleLogic.contains("<")) {
// IDEMPIERE-1328 - enable using format or subcolumns on title
if ( getADTab() != null
&& getADTab().getADTabpanel(0) != null
&& getADTab().getADTabpanel(0).getGridTab() != null
&& getADTab().getADTabpanel(0).getGridTab().getTableModel() != null) {
GridTab tab = getADTab().getADTabpanel(0).getGridTab();
PO po = tab.getTableModel().getPO(tab.getCurrentRow());
titleLogic = Env.parseVariable(titleLogic, po, null, false);
}
} else {
titleLogic = Env.parseContext(Env.getCtx(), curWindowNo, titleLogic, false, true);
}
sb.append(titleLogic);
header = sb.toString().trim();
if (header.endsWith(":"))
header = header.substring(0, header.length()-1);
}
if (Util.isEmpty(header))
header = AEnv.getDialogHeader(Env.getCtx(), curWindowNo, prefix);
SessionManager.getAppDesktop().setTabTitle(header, curWindowNo);
} }
String header = null;
if (! Util.isEmpty(titleLogic)) {
StringBuilder sb = new StringBuilder();
if (prefix != null)
sb.append(prefix);
sb.append(Env.getContext(ctx, curWindowNo, "_WinInfo_WindowName", false)).append(": ");
titleLogic = Env.parseContext(Env.getCtx(), curWindowNo, titleLogic, false, true);
sb.append(titleLogic);
header = sb.toString().trim();
if (header.endsWith(":"))
header = header.substring(0, header.length()-1);
}
if (Util.isEmpty(header))
header = AEnv.getDialogHeader(Env.getCtx(), curWindowNo, prefix);
SessionManager.getAppDesktop().setTabTitle(header, curWindowNo);
} }
else if (adTabbox.getSelectedDetailADTabpanel() == null) else if (adTabbox.getSelectedDetailADTabpanel() == null)
{ {
@ -1701,6 +1718,9 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
detailTab.dynamicDisplay(0); detailTab.dynamicDisplay(0);
} }
focusToActivePanel(); focusToActivePanel();
// IDEMPIERE-1328 - refresh recent item after running a process, i.e. completing a doc that changes documentno
MRecentItem.touchUpdatedRecord(ctx, adTabbox.getSelectedGridTab().getAD_Table_ID(),
adTabbox.getSelectedGridTab().getRecord_ID(), Env.getAD_User_ID(ctx));
} }
/** /**