details: https://code.openbravo.com/erp/stable/2.50/rev/bad644f56e10
changeset: 9707:bad644f56e10
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Oct 24 11:32:46 2011 +0200
summary: fixed bug 18556: Creating show production fields preference when
upgrading
diffstat:
src-db/database/sourcedata/AD_REF_LIST.xml | 12 +
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 143 +++++------
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 16 +
3 files changed, 98 insertions(+), 73 deletions(-)
diffs (truncated from 402 to 300 lines):
diff -r 0ff94ddb6520 -r bad644f56e10 src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml Mon Oct 24 09:24:36
2011 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml Mon Oct 24 11:32:46
2011 +0200
@@ -10806,4 +10806,16 @@
<!--FF80818130BC11480130BC1CEDD20021-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--FF80818130BC11480130BC1CEDD20021--></AD_REF_LIST>
+<!--FF80818130DF99930130DF9EE8180012--><AD_REF_LIST>
+<!--FF80818130DF99930130DF9EE8180012-->
<AD_REF_LIST_ID><![CDATA[FF80818130DF99930130DF9EE8180012]]></AD_REF_LIST_ID>
+<!--FF80818130DF99930130DF9EE8180012-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF80818130DF99930130DF9EE8180012--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF80818130DF99930130DF9EE8180012--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF80818130DF99930130DF9EE8180012-->
<VALUE><![CDATA[showMRPandProductionFields]]></VALUE>
+<!--FF80818130DF99930130DF9EE8180012--> <NAME><![CDATA[Show MRP and
Production Fileds]]></NAME>
+<!--FF80818130DF99930130DF9EE8180012--> <DESCRIPTION><![CDATA[If the value is
"Y", all related fields will be shown]]></DESCRIPTION>
+<!--FF80818130DF99930130DF9EE8180012-->
<AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--FF80818130DF99930130DF9EE8180012-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FF80818130DF99930130DF9EE8180012--></AD_REF_LIST>
+
</data>
diff -r 0ff94ddb6520 -r bad644f56e10
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Mon Oct
24 09:24:36 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Mon Oct
24 11:32:46 2011 +0200
@@ -63,6 +63,7 @@
import org.openbravo.erpCommon.obps.ActivationKey.CommercialModuleStatus;
import org.openbravo.erpCommon.obps.ActivationKey.LicenseClass;
import org.openbravo.erpCommon.obps.ActivationKey.SubscriptionStatus;
+import org.openbravo.erpCommon.obps.ActiveInstanceProcess;
import org.openbravo.erpCommon.obps.DisabledModules;
import org.openbravo.erpCommon.utility.ComboTableData;
import org.openbravo.erpCommon.utility.FieldProviderFactory;
@@ -138,8 +139,8 @@
} else if (vars.commandIn("INSTALL")) {
final String record = vars.getStringParameter("inpcRecordId");
- printPageInstall1(response, request, vars, record, false, null, new
String[0],
- ModuleUtiltiy.getSystemMaturityLevels(true), null);
+ printPageInstall1(response, request, vars, record, false, null, new
String[0], ModuleUtiltiy
+ .getSystemMaturityLevels(true), null);
} else if (vars.commandIn("INSTALL2")) {
printPageInstall2(response, vars);
} else if (vars.commandIn("INSTALL3")) {
@@ -162,8 +163,8 @@
// clean module updates if there are any
boolean isCleaned = cleanModulesUpdates();
if (isCleaned) {
- msg = OBErrorBuilder.buildMessage(msg, "Info",
- Utility.messageBD(this, "ModuleUpdatesRemoved",
vars.getLanguage()));
+ msg = OBErrorBuilder.buildMessage(msg, "Info", Utility.messageBD(this,
+ "ModuleUpdatesRemoved", vars.getLanguage()));
}
response.sendRedirect(strDireccion + request.getServletPath() +
"?Command=DEFAULT");
log4j.info(modules);
@@ -186,8 +187,8 @@
}
// For update obtain just update maturity level
- printPageInstall1(response, request, vars, null, false, null,
modulesToUpdate,
- ModuleUtiltiy.getSystemMaturityLevels(false), null);
+ printPageInstall1(response, request, vars, null, false, null,
modulesToUpdate, ModuleUtiltiy
+ .getSystemMaturityLevels(false), null);
} else if (vars.commandIn("UPGRADE", "UPGRADE1")) {
OBContext.setAdminMode();
try {
@@ -448,8 +449,8 @@
// In case the search results must be shown request and display them
if (displaySearch)
- xmlDocument.setParameter("searchResults",
- getSearchResults(request, response, vars, searchText));
+ xmlDocument.setParameter("searchResults", getSearchResults(request,
response, vars,
+ searchText));
out.println(xmlDocument.print());
out.close();
@@ -506,8 +507,8 @@
xmlDocument.setParameter("inpUser", strUser);
try {
ComboTableData comboTableData = new ComboTableData(vars, this, "18",
"AD_User_ID", "110", "",
- Utility.getContext(this, vars, "#AccessibleOrgTree",
"ModuleManagement"),
- Utility.getContext(this, vars, "#User_Client", "ModuleManagement"),
0);
+ Utility.getContext(this, vars, "#AccessibleOrgTree",
"ModuleManagement"), Utility
+ .getContext(this, vars, "#User_Client", "ModuleManagement"), 0);
Utility.fillSQLParameters(this, vars, null, comboTableData,
"ModuleManagement", strUser);
xmlDocument.setData("reportUser", "liststructure",
comboTableData.select(false));
comboTableData = null;
@@ -578,8 +579,8 @@
xmlDocument.setParameter("urlLink", getLink(url));
xmlDocument.setParameter("url", url);
}
- xmlDocument.setParameter("license",
- Utility.getListValueName("License Type", module.getLicenseType(),
vars.getLanguage()));
+ xmlDocument.setParameter("license", Utility.getListValueName("License
Type", module
+ .getLicenseType(), vars.getLanguage()));
if (dependencies != null && dependencies.length > 0) {
xmlDocument.setData("dependencies", formatDeps4Display(dependencies,
vars, this));
@@ -622,11 +623,11 @@
private static String getDisplayString(ModuleDependency dep,
VariablesSecureApp vars,
ConnectionProvider conn) {
- final String DETAIL_MSG_DETAIL_BETWEEN = Utility.messageBD(conn,
"MODULE_VERSION_BETWEEN",
- vars.getLanguage());
+ final String DETAIL_MSG_DETAIL_BETWEEN = Utility.messageBD(conn,
"MODULE_VERSION_BETWEEN", vars
+ .getLanguage());
- final String DETAIL_MSG_OR_LATER = Utility.messageBD(conn,
"MODULE_VERSION_OR_LATER",
- vars.getLanguage());
+ final String DETAIL_MSG_OR_LATER = Utility.messageBD(conn,
"MODULE_VERSION_OR_LATER", vars
+ .getLanguage());
final String VERSION = Utility.messageBD(conn, "VERSION",
vars.getLanguage());
@@ -830,8 +831,8 @@
xmlDocument.setParameter("moduleID", moduleId);
xmlDocument.setParameter("upgradeVersion", version);
- xmlDocument.setData("updateNeeded",
- FieldProviderFactory.getFieldProviderArray(requiredUpdates));
+ xmlDocument.setData("updateNeeded", FieldProviderFactory
+ .getFieldProviderArray(requiredUpdates));
response.setContentType("text/html; charset=UTF-8");
final PrintWriter out = response.getWriter();
@@ -859,6 +860,10 @@
Preferences.setPreferenceValue("isUpgrading", "Y", true, null, null,
null, null, null,
null);
+ // Set show production fields property for Openbravo 3 regarding
instance activation
+ ActiveInstanceProcess
+
.updateShowProductionFields(ActivationKey.getInstance().isActive() ? "Y" : "N");
+
// Continue with standard update
printPageInstall1(response, request, vars, "0", false, null, new
String[] { "0" },
ModuleUtiltiy.getSystemMaturityLevels(false), im);
@@ -991,8 +996,8 @@
}
otherDeps += dep;
} else {
- String unknownMsg = Utility.messageBD(this,
err.getString("errorCode"),
- vars.getLanguage());
+ String unknownMsg = Utility.messageBD(this,
err.getString("errorCode"), vars
+ .getLanguage());
if (unknownMsg.equals(err.getString("errorCode"))) {
unknownMsg = err.getString("message");
} else if (err.has("isMaturity") &&
err.getBoolean("isMaturity")) {
@@ -1194,8 +1199,8 @@
+ " "
+ module.getVersionNo()
+ " "
- + Utility.messageBD(this,
"OtherModuleVersionToinstallOrigall",
- vars.getLanguage()) + " " +
installOrig[i].getVersionNo());
+ + Utility.messageBD(this,
"OtherModuleVersionToinstallOrigall", vars
+ .getLanguage()) + " " + installOrig[i].getVersionNo());
}
if (found) {
module = installOrig[i];
@@ -1270,8 +1275,8 @@
if (!check) {
discard[8] = ""; // show missing dependencies message
message.setType("Warning");
- message
- .setTitle(Utility.messageBD(this, "DependenciesNotSatisfied",
vars.getLanguage()));
+ message.setTitle(Utility
+ .messageBD(this, "DependenciesNotSatisfied",
vars.getLanguage()));
}
}
@@ -1315,13 +1320,13 @@
xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage()
+ "\";");
xmlDocument.setParameter("theme", vars.getTheme());
if (inst != null && inst.length > 0) {
- xmlDocument.setData("installs",
- getModuleFieldProvider(inst, minVersions, false, vars.getLanguage(),
islocal));
+ xmlDocument.setData("installs", getModuleFieldProvider(inst,
minVersions, false, vars
+ .getLanguage(), islocal));
}
if (upd != null && upd.length > 0) {
- xmlDocument.setData("updates",
- getModuleFieldProvider(upd, minVersions, false, vars.getLanguage(),
islocal));
+ xmlDocument.setData("updates", getModuleFieldProvider(upd, minVersions,
false, vars
+ .getLanguage(), islocal));
}
if (merges != null && merges.length > 0) {
@@ -1341,8 +1346,8 @@
xmlDocument.setParameter("maturityStyle", "none");
} else {
xmlDocument.setParameter("maturityStyle", "yes");
- xmlDocument.setParameter("maturityLevel",
- (String) module.getAdditionalInfo().get("maturity.name"));
+ xmlDocument.setParameter("maturityLevel", (String)
module.getAdditionalInfo().get(
+ "maturity.name"));
}
}
{
@@ -1392,10 +1397,8 @@
}
mod.put("versionNoCurr",
currentInstalledVersion(module.getModuleID()));
} else {
- mod.put(
- "versionNoMin",
- (minVersions.get(module.getModuleID()) == null ?
module.getVersionNo() : minVersions
- .get(module.getModuleID())));
+ mod.put("versionNoMin", (minVersions.get(module.getModuleID()) == null
? module
+ .getVersionNo() : minVersions.get(module.getModuleID())));
}
if (!islocal) {
@@ -1554,8 +1557,8 @@
xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage()
+ "\";");
xmlDocument.setParameter("theme", vars.getTheme());
xmlDocument.setParameter("minCoreVersion", minCoreVersion);
- xmlDocument.setData("notAllowedModules",
- FieldProviderFactory.getFieldProviderArray(modulesToAcquire));
+ xmlDocument.setData("notAllowedModules", FieldProviderFactory
+ .getFieldProviderArray(modulesToAcquire));
response.setContentType("text/html; charset=UTF-8");
final PrintWriter out = response.getWriter();
out.println(xmlDocument.print());
@@ -1981,11 +1984,11 @@
notifications = getNotificationsJSON(vars.getLanguage());
if (!notifications.has("updatesRebuildHTML")) {
if (!"".equals(ImportModule.getScanError().toString())) {
- notifications.put("updatesRebuildHTML",
- Utility.messageBD(this, ImportModule.getScanError().toString(),
vars.getLanguage()));
+ notifications.put("updatesRebuildHTML", Utility.messageBD(this,
ImportModule
+ .getScanError().toString(), vars.getLanguage()));
} else {
- notifications = notifications.put("updatesRebuildHTML",
- Utility.messageBD(this, "NoUpdatesAvailable",
vars.getLanguage()));
+ notifications = notifications.put("updatesRebuildHTML",
Utility.messageBD(this,
+ "NoUpdatesAvailable", vars.getLanguage()));
}
}
@@ -2039,11 +2042,11 @@
boolean isCleaned = cleanModulesUpdates();
if (isCleaned) {
- myMessage = OBErrorBuilder.buildMessage(myMessage, "Info",
- Utility.messageBD(this, "ModuleUpdatesRemoved",
vars.getLanguage()));
+ myMessage = OBErrorBuilder.buildMessage(myMessage, "Info",
Utility.messageBD(this,
+ "ModuleUpdatesRemoved", vars.getLanguage()));
}
- myMessage = OBErrorBuilder.buildMessage(myMessage, "Success",
- Utility.messageBD(this, "ModuleManagementSettingSaved",
vars.getLanguage()));
+ myMessage = OBErrorBuilder.buildMessage(myMessage, "Success",
Utility.messageBD(this,
+ "ModuleManagementSettingSaved", vars.getLanguage()));
} finally {
OBInterceptor.setPreventUpdateInfoChange(false);
@@ -2078,20 +2081,18 @@
warn = true;
warnMsg += "<br/>"
+ Utility.messageBD(this, "ModuleDependsButInstalled",
vars.getLanguage())
- .replace("@module@",
dep.getDependentModule().getName())
- .replace("@version@", dep.getFirstVersion())
- .replace("@installed@",
dep.getDependentModule().getVersion());
+ .replace("@module@",
dep.getDependentModule().getName()).replace(
+ "@version@",
dep.getFirstVersion()).replace("@installed@",
+ dep.getDependentModule().getVersion());
} else if (dep.getLastVersion() != null
&& !(vc.compare(dep.getFirstVersion(),
dep.getDependentModule().getVersion()) <= 0 && vc
.compare(dep.getLastVersion(),
dep.getDependentModule().getVersion()) >= 0)) {
save = false;
warn = true;
warnMsg += "<br/>"
- + Utility
- .messageBD(this, "ModuleDependsButInstalled",
vars.getLanguage())
- .replace("@module@",
dep.getDependentModule().getName())
- .replace("@version@",
- dep.getFirstVersion() + " - " +
dep.getLastVersion())
+ + Utility.messageBD(this, "ModuleDependsButInstalled",
vars.getLanguage())
+ .replace("@module@",
dep.getDependentModule().getName()).replace(
+ "@version@", dep.getFirstVersion() + " - " +
dep.getLastVersion())
.replace("@installed@",
dep.getDependentModule().getVersion());
}
}
@@ -2110,16 +2111,17 @@
// clean module updates if there are any
final boolean isCleaned = cleanModulesUpdates();
if (isCleaned) {
- myMessage = OBErrorBuilder.buildMessage(myMessage, "Info",
- Utility.messageBD(this, "ModuleUpdatesRemoved",
vars.getLanguage()));
+ myMessage = OBErrorBuilder.buildMessage(myMessage, "Info",
Utility.messageBD(this,
+ "ModuleUpdatesRemoved", vars.getLanguage()));
}
if (warn) {
- myMessage = OBErrorBuilder.buildMessage(myMessage, "Warning",
- Utility.messageBD(this, "CannotSetMinorEnforcements",
vars.getLanguage()) + warnMsg);
+ myMessage = OBErrorBuilder.buildMessage(myMessage, "Warning",
Utility.messageBD(this,
+ "CannotSetMinorEnforcements", vars.getLanguage())
+ + warnMsg);
} else {
- myMessage = OBErrorBuilder.buildMessage(myMessage, "Success",
- Utility.messageBD(this, "ModuleManagementSettingSaved",
vars.getLanguage()));
+ myMessage = OBErrorBuilder.buildMessage(myMessage, "Success",
Utility.messageBD(this,
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
