[OpenbravoERP-commits] devel/pi: [life-cycle] Fixed obx installation

[hg]

details:   /erp/devel/pi/rev/038dffeaa6d0
changeset: 7871:038dffeaa6d0
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Jul 13 11:21:41 2010 +0200
summary:   [life-cycle] Fixed obx installation

diffstat:

 src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java |  18 +++++++------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r dc5a763d6a3a -r 038dffeaa6d0 
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java        Tue Jul 
13 08:24:07 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java        Tue Jul 
13 11:21:41 2010 +0200
@@ -792,12 +792,12 @@
     xmlDocument.setParameter("theme", vars.getTheme());
     if (inst != null && inst.length > 0) {
       xmlDocument.setData("installs", getModuleFieldProvider(inst, 
minVersions, false, vars
-          .getLanguage()));
+          .getLanguage(), islocal));
     }
 
     if (upd != null && upd.length > 0) {
       xmlDocument.setData("updates", getModuleFieldProvider(upd, minVersions, 
false, vars
-          .getLanguage()));
+          .getLanguage(), islocal));
     }
 
     xmlDocument.setParameter("inpLocalInstall", islocal ? "Y" : "N");
@@ -831,7 +831,7 @@
   }
 
   private FieldProvider[] getModuleFieldProvider(Module[] inst, Map<String, 
String> minVersions,
-      boolean installed, String lang) {
+      boolean installed, String lang, boolean islocal) {
     ArrayList<HashMap<String, String>> rt = new ArrayList<HashMap<String, 
String>>();
 
     for (Module module : inst) {
@@ -852,11 +852,13 @@
             .getVersionNo() : minVersions.get(module.getModuleID())));
       }
 
-      if ("500".equals((String) 
module.getAdditionalInfo().get("maturity.level"))) {
-        mod.put("maturityStyle", "none");
-      } else {
-        mod.put("maturityStyle", "yes");
-        mod.put("maturityLevel", (String) 
module.getAdditionalInfo().get("maturity.name"));
+      if (!islocal) {
+        if ("500".equals((String) 
module.getAdditionalInfo().get("maturity.level"))) {
+          mod.put("maturityStyle", "none");
+        } else {
+          mod.put("maturityStyle", "yes");
+          mod.put("maturityLevel", (String) 
module.getAdditionalInfo().get("maturity.name"));
+        }
       }
       rt.add(mod);
     }

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits