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

IDEMPIERE-5795: DeveloperMode context variable (#1929) 

https: //idempiere.atlassian.net/browse/IDEMPIERE-5795

Co-authored-by: Carlos Ruiz <carg67@gmail.com>
This commit is contained in:
Nicolas Micoud 2023-07-08 04:42:57 +02:00 committed by GitHub
parent 00c4fec2f4
commit 71a49baf00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/dbPort/Convert.java
View File

@ -529,9 +529,8 @@ public abstract class Convert
public static String getMigrationScriptFolder(String dbtype) { public static String getMigrationScriptFolder(String dbtype) {
// migration/iD[version]/[oracle|postgresql] directory // migration/iD[version]/[oracle|postgresql] directory
String version = Adempiere.MAIN_VERSION.substring(8); String version = Adempiere.MAIN_VERSION.substring(8);
boolean isIDE = Files.isDirectory(Paths.get(Adempiere.getAdempiereHome() + File.separator + "org.adempiere.base"));
String homeScript; String homeScript;
if (isIDE) if (Util.isDeveloperMode())
homeScript = Adempiere.getAdempiereHome() + File.separator; homeScript = Adempiere.getAdempiereHome() + File.separator;
else else
homeScript = System.getProperty("java.io.tmpdir") + File.separator; homeScript = System.getProperty("java.io.tmpdir") + File.separator;

1
org.adempiere.base/src/org/compiere/util/Env.java
View File

@ -118,6 +118,7 @@ public final class Env
public static final String HAS_ALIAS = "$HasAlias"; public static final String HAS_ALIAS = "$HasAlias";
public static final String IS_CAN_APPROVE_OWN_DOC = "#IsCanApproveOwnDoc"; public static final String IS_CAN_APPROVE_OWN_DOC = "#IsCanApproveOwnDoc";
public static final String IS_CLIENT_ADMIN = "#IsClientAdmin"; public static final String IS_CLIENT_ADMIN = "#IsClientAdmin";
public static final String DEVELOPER_MODE = "#DeveloperMode";
/** Context Language identifier */ /** Context Language identifier */
public static final String LANGUAGE = "#AD_Language"; public static final String LANGUAGE = "#AD_Language";
public static final String LANGUAGE_NAME = "#LanguageName"; public static final String LANGUAGE_NAME = "#LanguageName";

1
org.adempiere.base/src/org/compiere/util/Login.java
View File

@ -874,6 +874,7 @@ public class Login
// Other Settings // Other Settings
Env.setContext(m_ctx, "#YYYY", "Y"); Env.setContext(m_ctx, "#YYYY", "Y");
Env.setContext(m_ctx, Env.DEVELOPER_MODE, Util.isDeveloperMode() ? "Y" : "N");
Env.setContext(m_ctx, Env.STANDARD_PRECISION, 2); Env.setContext(m_ctx, Env.STANDARD_PRECISION, 2);
// AccountSchema Info (first) // AccountSchema Info (first)

11
org.adempiere.base/src/org/compiere/util/Util.java
View File

@ -21,6 +21,8 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.AttributedCharacterIterator; import java.text.AttributedCharacterIterator;
import java.text.AttributedString; import java.text.AttributedString;
@ -42,6 +44,8 @@ import javax.swing.InputMap;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import org.compiere.Adempiere;
import com.lowagie.text.Document; import com.lowagie.text.Document;
import com.lowagie.text.DocumentException; import com.lowagie.text.DocumentException;
import com.lowagie.text.pdf.PdfContentByte; import com.lowagie.text.pdf.PdfContentByte;
@ -777,4 +781,11 @@ public class Util
return value == null ? false : value.matches(UUID_REGEX); return value == null ? false : value.matches(UUID_REGEX);
} }
/**
* @return true if there is a directory org.adempiere.base within AdempiereHome (is the case when executed from Eclipse)
*/
public static boolean isDeveloperMode() {
return Files.isDirectory(Paths.get(Adempiere.getAdempiereHome() + File.separator + "org.adempiere.base"));
}
} // Util } // Util