[OpenbravoERP-commits] devel/pi: Fixes issue 10769: Module Management window typo on up...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/94ab687f1f98
changeset: 15563:94ab687f1f98
user:      Miguel de Juana <miguel.dejuana <at> openbravo.com>
date:      Thu Feb 16 17:25:51 2012 +0100
summary:   Fixes issue 10769: Module Management window typo on update scanning 
resolved

diffstat:

 src-db/database/sourcedata/AD_MESSAGE.xml                  |  11 ++++++++
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java |  18 ++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 6289860471ca -r 94ab687f1f98 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 22 09:54:57 2012 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Feb 16 17:25:51 2012 +0100
@@ -17136,6 +17136,17 @@
 <!--7759F8671BEB47129ABEF48BE31D64E9-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7759F8671BEB47129ABEF48BE31D64E9--></AD_MESSAGE>
 
+<!--77E12DCE8620413998EBBD3BD7F197DD--><AD_MESSAGE>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  
<AD_MESSAGE_ID><![CDATA[77E12DCE8620413998EBBD3BD7F197DD]]></AD_MESSAGE_ID>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  
<VALUE><![CDATA[UpdatesAvailable]]></VALUE>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  <MSGTEXT><![CDATA[updates 
available]]></MSGTEXT>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--77E12DCE8620413998EBBD3BD7F197DD-->  
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--77E12DCE8620413998EBBD3BD7F197DD--></AD_MESSAGE>
+
 <!--785509D8468543F4AF2FE440D9511CF1--><AD_MESSAGE>
 <!--785509D8468543F4AF2FE440D9511CF1-->  
<AD_MESSAGE_ID><![CDATA[785509D8468543F4AF2FE440D9511CF1]]></AD_MESSAGE_ID>
 <!--785509D8468543F4AF2FE440D9511CF1-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6289860471ca -r 94ab687f1f98 
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java        Wed Feb 
22 09:54:57 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java        Thu Feb 
16 17:25:51 2012 +0100
@@ -342,17 +342,24 @@
         }
 
         // Check for updates
+        String message = "";
         total = ModuleManagementData.selectUpdate(this);
         if (!total.equals("0")) {
           if (!updatesRebuildHTML.isEmpty()) {
             updatesRebuildHTML += "&nbsp;/&nbsp;";
           }
+          if (total.equals("1")) {
+            message = Utility.messageBD(this, "UpdateAvailable", 
lang).toLowerCase();
+          } else {
+            message = Utility.messageBD(this, "UpdatesAvailable", lang);
+          }
           updatesRebuildHTML += total
               + "&nbsp;"
-              + Utility.messageBD(this, "UpdateAvailable", lang)
+              + message
               + "&nbsp;"
               + "<a class=\"LabelLink_noicon\" href=\"#\" 
onclick=\"installUpdate('all'); return false;\">"
               + Utility.messageBD(this, "InstallUpdatesNow", lang) + "</a>";
+
         }
       }
 
@@ -1156,12 +1163,9 @@
                 message = new OBError();
                 message.setType("Warning");
                 message.setTitle(Utility.messageBD(this, message.getType(), 
vars.getLanguage()));
-                message.setMessage(module.getName()
-                    + " "
-                    + module.getVersionNo()
-                    + " "
-                    + Utility.messageBD(this, "OtherModuleVersionToinstall",
-                        vars.getLanguage()) + " " + 
installOrig[i].getVersionNo());
+                message.setMessage(module.getName() + " " + 
module.getVersionNo() + " "
+                    + Utility.messageBD(this, "OtherModuleVersionToinstall", 
vars.getLanguage())
+                    + " " + installOrig[i].getVersionNo());
               }
               if (found) {
                 module = installOrig[i];

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits