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

IDEMPIERE-4874 : Process customization must have effect on Menu and Tab title (#778)

This commit is contained in:
Nicolas Micoud 2021-07-11 07:56:31 +02:00 committed by GitHub
parent c9d7cb3afd
commit 19cfc2d07d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.adempiere.base/src/org/compiere/model/MTree.java
View File

@ -49,7 +49,7 @@ public class MTree extends MTree_Base
/** /**
* *
*/ */
private static final long serialVersionUID = -212066085945645584L; private static final long serialVersionUID = 8572653421094006917L;
/** /**
* Default Constructor. * Default Constructor.
@ -604,8 +604,20 @@ public class MTree extends MTree_Base
} }
} }
else if (X_AD_Menu.ACTION_Process.equals(actionColor) else if (X_AD_Menu.ACTION_Process.equals(actionColor)
|| X_AD_Menu.ACTION_Report.equals(actionColor)) || X_AD_Menu.ACTION_Report.equals(actionColor)) {
access = role.getProcessAccess(AD_Process_ID); access = role.getProcessAccess(AD_Process_ID);
// Get ProcessCustomization
MUserDefProc userDef = null;
userDef = MUserDefProc.getBestMatch(getCtx(), AD_Process_ID);
if (userDef != null)
{
if (userDef.getName() != null)
name = userDef.getName();
if (userDef.getDescription() != null)
description = userDef.getDescription();
}
}
else if (X_AD_Menu.ACTION_Form.equals(actionColor)) else if (X_AD_Menu.ACTION_Form.equals(actionColor))
access = role.getFormAccess(AD_Form_ID); access = role.getFormAccess(AD_Form_ID);
else if (X_AD_Menu.ACTION_WorkFlow.equals(actionColor)) else if (X_AD_Menu.ACTION_WorkFlow.equals(actionColor))

33
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java
View File

@ -69,12 +69,13 @@ import org.compiere.model.MPInstance;
import org.compiere.model.MPInstanceLog; import org.compiere.model.MPInstanceLog;
import org.compiere.model.MPInstancePara; import org.compiere.model.MPInstancePara;
import org.compiere.model.MProcess; import org.compiere.model.MProcess;
import org.compiere.model.MReportView;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.model.MUser; import org.compiere.model.MUser;
import org.compiere.model.MUserDefProc;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.model.SystemIDs; import org.compiere.model.SystemIDs;
import org.compiere.model.MReportView;
import org.compiere.print.MPrintFormat; import org.compiere.print.MPrintFormat;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil; import org.compiere.process.ProcessInfoUtil;
@ -108,7 +109,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
/** /**
* *
*/ */
private static final long serialVersionUID = -9220870163215609274L; private static final long serialVersionUID = -7374210834757533221L;
private static final String ON_COMPLETE = "onComplete"; private static final String ON_COMPLETE = "onComplete";
private static final String ON_STATUS_UPDATE = "onStatusUpdate"; private static final String ON_STATUS_UPDATE = "onStatusUpdate";
@ -128,6 +129,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
private BusyDialog progressWindow; private BusyDialog progressWindow;
private String m_Name = null; private String m_Name = null;
private String m_Description = null;
private String m_Help = null;
private String m_ShowHelp = null; // Determine if a Help Process Window is shown private String m_ShowHelp = null; // Determine if a Help Process Window is shown
private String initialMessage; private String initialMessage;
@ -189,19 +192,27 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI
if (rs.next()) if (rs.next())
{ {
m_Name = rs.getString(1); m_Name = rs.getString(1);
m_Description = rs.getString(2);
m_Help = rs.getString(3);
m_ShowHelp = rs.getString(5); m_ShowHelp = rs.getString(5);
//
// User Customization
MUserDefProc userDef = MUserDefProc.getBestMatch(ctx, AD_Process_ID);
if (userDef != null) {
if (userDef.getName() != null)
m_Name = userDef.getName();
if (userDef.getDescription() != null)
m_Description = userDef.getDescription();
if (userDef.getHelp() != null)
m_Help = userDef.getHelp();
}
buildMsg.append("<b>"); buildMsg.append("<b>");
String s = rs.getString(2); // Description buildMsg.append(Util.isEmpty(m_Description) ? Msg.getMsg(m_ctx, "StartProcess?") : m_Description);
if (rs.wasNull())
buildMsg.append(Msg.getMsg(m_ctx, "StartProcess?"));
else
buildMsg.append(s);
buildMsg.append("</b>"); buildMsg.append("</b>");
s = rs.getString(3); // Help if (!Util.isEmpty(m_Help))
if (!rs.wasNull()) buildMsg.append("<p>").append(m_Help).append("</p>");
buildMsg.append("<p>").append(s).append("</p>");
m_AD_Process_UU = rs.getString(6); m_AD_Process_UU = rs.getString(6);
} }