details: https://code.openbravo.com/erp/devel/pi/rev/a2d49fe9a3c0
changeset: 35470:a2d49fe9a3c0
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Feb 26 10:06:45 2019 +0100
summary: fixes 40273: show host name and background policy in about popup
diffstat:
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 ++++++++++++++++++++++
src/org/openbravo/erpCommon/ad_forms/About.html | 8 +++++++-
src/org/openbravo/erpCommon/ad_forms/About.java | 7 +++++++
src/org/openbravo/erpCommon/ad_forms/About.xml | 4 +++-
4 files changed, 39 insertions(+), 2 deletions(-)
diffs (111 lines):
diff -r 75475ade8e76 -r a2d49fe9a3c0
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Feb 26 09:46:41
2019 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Feb 26 10:06:45
2019 +0100
@@ -14448,6 +14448,17 @@
<!--5DA9628723CA4050B7C2220719786424-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--5DA9628723CA4050B7C2220719786424--></AD_TEXTINTERFACES>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B--><AD_TEXTINTERFACES>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B-->
<AD_TEXTINTERFACES_ID><![CDATA[5DE6FE7DC6BF4703B38350ACC9AD863B]]></AD_TEXTINTERFACES_ID>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B--> <TEXT><![CDATA[Background
Policy:]]></TEXT>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5DE6FE7DC6BF4703B38350ACC9AD863B--></AD_TEXTINTERFACES>
+
<!--5E3AD9477F004EC0E040007F01004301--><AD_TEXTINTERFACES>
<!--5E3AD9477F004EC0E040007F01004301-->
<AD_TEXTINTERFACES_ID><![CDATA[5E3AD9477F004EC0E040007F01004301]]></AD_TEXTINTERFACES_ID>
<!--5E3AD9477F004EC0E040007F01004301-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21761,6 +21772,17 @@
<!--E447A26C82EC4442A557AA56CD8FCE79-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--E447A26C82EC4442A557AA56CD8FCE79--></AD_TEXTINTERFACES>
+<!--E52DC00277704028B1DE0E0C83C62520--><AD_TEXTINTERFACES>
+<!--E52DC00277704028B1DE0E0C83C62520-->
<AD_TEXTINTERFACES_ID><![CDATA[E52DC00277704028B1DE0E0C83C62520]]></AD_TEXTINTERFACES_ID>
+<!--E52DC00277704028B1DE0E0C83C62520-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E52DC00277704028B1DE0E0C83C62520--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E52DC00277704028B1DE0E0C83C62520--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E52DC00277704028B1DE0E0C83C62520--> <TEXT><![CDATA[Host Name:]]></TEXT>
+<!--E52DC00277704028B1DE0E0C83C62520-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--E52DC00277704028B1DE0E0C83C62520--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E52DC00277704028B1DE0E0C83C62520-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E52DC00277704028B1DE0E0C83C62520--></AD_TEXTINTERFACES>
+
<!--E55484544AE94529953141C26E5303D1--><AD_TEXTINTERFACES>
<!--E55484544AE94529953141C26E5303D1-->
<AD_TEXTINTERFACES_ID><![CDATA[E55484544AE94529953141C26E5303D1]]></AD_TEXTINTERFACES_ID>
<!--E55484544AE94529953141C26E5303D1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 75475ade8e76 -r a2d49fe9a3c0
src/org/openbravo/erpCommon/ad_forms/About.html
--- a/src/org/openbravo/erpCommon/ad_forms/About.html Tue Feb 26 09:46:41
2019 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/About.html Tue Feb 26 10:06:45
2019 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2018 Openbravo SLU
+ * All portions are Copyright (C) 2001-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -114,6 +114,12 @@
<tr id="paramPOSInfo">
<td>WebPOS Terminals:</td><td> <td><td
id="paraOPSPOSAccess">xx</td>
</tr>
+ <td>Host Name:</td><td> <td><td
id="paraHostName">xx</td>
+ <tr>
+ </tr>
+ <td>Background Policy:</td><td> <td><td
id="paraBackground">xx</td>
+ <tr>
+ </tr>
</table>
</td>
</tr>
diff -r 75475ade8e76 -r a2d49fe9a3c0
src/org/openbravo/erpCommon/ad_forms/About.java
--- a/src/org/openbravo/erpCommon/ad_forms/About.java Tue Feb 26 09:46:41
2019 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/About.java Tue Feb 26 10:06:45
2019 +0100
@@ -29,8 +29,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.openbravo.base.ConfigParameters;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.dal.core.OBContext;
import org.openbravo.data.FieldProvider;
import org.openbravo.erpCommon.modules.ModuleTreeData;
@@ -95,6 +97,11 @@
xmlDocument.setParameter("paramLicensedTo", licenseInfo);
xmlDocument.setParameter("ver", version.getMajorVersion() + " " +
version.getMP());
xmlDocument.setParameter("versionNo", version.getVersionNumber());
+ xmlDocument.setParameter("paraHostName",
ConfigParameters.getMachineName());
+ xmlDocument.setParameter("paraBackground",
+ OBPropertiesProvider.getInstance()
+ .getOpenbravoProperties()
+ .getProperty("background.policy", "default"));
xmlDocument.setData("installedModules", getInstalledModules());
if (ActivationKey.isActiveInstance()) {
diff -r 75475ade8e76 -r a2d49fe9a3c0
src/org/openbravo/erpCommon/ad_forms/About.xml
--- a/src/org/openbravo/erpCommon/ad_forms/About.xml Tue Feb 26 09:46:41
2019 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/About.xml Tue Feb 26 10:06:45
2019 +0100
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2018 Openbravo SLU
+ * All portions are Copyright (C) 2001-2019 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -30,6 +30,8 @@
<PARAMETER id="paraOPSWSAccess" name="paraOPSWSAccess" default=""/>
<PARAMETER id="paraOPSPOSAccess" name="paraOPSPOSAccess" default=""/>
<PARAMETER id="paraOBPSStatus" name="paraOBPSStatus" default=""/>
+ <PARAMETER id="paraHostName" name="paraHostName" default=""/>
+ <PARAMETER id="paraBackground" name="paraBackground" default=""/>
<structure name="installedModules">
<FIELD id="modTab">tab</FIELD>
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
