details: /erp/devel/int/rev/509a246e7bd4
changeset: 6946:509a246e7bd4
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 07 11:59:21 2010 +0200
summary: Fixes Hudson consistency-test #411
details: /erp/devel/int/rev/5405425e49d3
changeset: 6947:5405425e49d3
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Apr 07 13:07:18 2010 +0200
summary: fixed issue 12892: Show if a module is commercial or not in the
search results pane (MMC)
diffstat:
src-db/database/sourcedata/AD_ELEMENT.xml | 22
-------
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 +++
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 29
+++++++--
src/org/openbravo/erpCommon/modules/ModuleBox.srpt | 11
+++-
src/org/openbravo/erpCommon/modules/ModuleBox.xml | 3 +-
web/skins/Default/Main/_ParticularItems/AddModule/iconCommercial.gif | 0
web/skins/Default/Openbravo_ERP_250.css | 17
+++++-
7 files changed, 60 insertions(+), 33 deletions(-)
diffs (203 lines):
diff -r 6cc47c61b609 -r 5405425e49d3 src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Apr 07 11:15:56 2010 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml Wed Apr 07 13:07:18 2010 +0200
@@ -22047,17 +22047,6 @@
<!--361ED16139BD40CBA4DB049380EE1641-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--361ED16139BD40CBA4DB049380EE1641--></AD_ELEMENT>
-<!--36C60E53F1274EDA827ED5146A2B13D1--><AD_ELEMENT>
-<!--36C60E53F1274EDA827ED5146A2B13D1-->
<AD_ELEMENT_ID><![CDATA[36C60E53F1274EDA827ED5146A2B13D1]]></AD_ELEMENT_ID>
-<!--36C60E53F1274EDA827ED5146A2B13D1-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--36C60E53F1274EDA827ED5146A2B13D1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--36C60E53F1274EDA827ED5146A2B13D1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--36C60E53F1274EDA827ED5146A2B13D1-->
<COLUMNNAME><![CDATA[EM_APRM_Process_Proposal]]></COLUMNNAME>
-<!--36C60E53F1274EDA827ED5146A2B13D1--> <NAME><![CDATA[Process
Proposal]]></NAME>
-<!--36C60E53F1274EDA827ED5146A2B13D1--> <PRINTNAME><![CDATA[Process
Proposal]]></PRINTNAME>
-<!--36C60E53F1274EDA827ED5146A2B13D1-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--36C60E53F1274EDA827ED5146A2B13D1--></AD_ELEMENT>
-
<!--3B584D993CCF41B698DBE642AFC21AE4--><AD_ELEMENT>
<!--3B584D993CCF41B698DBE642AFC21AE4-->
<AD_ELEMENT_ID><![CDATA[3B584D993CCF41B698DBE642AFC21AE4]]></AD_ELEMENT_ID>
<!--3B584D993CCF41B698DBE642AFC21AE4-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26164,17 +26153,6 @@
<!--828EE0AE80575FA1E040007F010067C7-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--828EE0AE80575FA1E040007F010067C7--></AD_ELEMENT>
-<!--8337CDFBF2904C07AB7F9D69E1536663--><AD_ELEMENT>
-<!--8337CDFBF2904C07AB7F9D69E1536663-->
<AD_ELEMENT_ID><![CDATA[8337CDFBF2904C07AB7F9D69E1536663]]></AD_ELEMENT_ID>
-<!--8337CDFBF2904C07AB7F9D69E1536663-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8337CDFBF2904C07AB7F9D69E1536663--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8337CDFBF2904C07AB7F9D69E1536663--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8337CDFBF2904C07AB7F9D69E1536663-->
<COLUMNNAME><![CDATA[EM_APRM_SelExpectedPayments]]></COLUMNNAME>
-<!--8337CDFBF2904C07AB7F9D69E1536663--> <NAME><![CDATA[Select Expected
Payments]]></NAME>
-<!--8337CDFBF2904C07AB7F9D69E1536663--> <PRINTNAME><![CDATA[Select Expected
Payments]]></PRINTNAME>
-<!--8337CDFBF2904C07AB7F9D69E1536663-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8337CDFBF2904C07AB7F9D69E1536663--></AD_ELEMENT>
-
<!--8CF76E08562A480D96D45C04F42D095E--><AD_ELEMENT>
<!--8CF76E08562A480D96D45C04F42D095E-->
<AD_ELEMENT_ID><![CDATA[8CF76E08562A480D96D45C04F42D095E]]></AD_ELEMENT_ID>
<!--8CF76E08562A480D96D45C04F42D095E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6cc47c61b609 -r 5405425e49d3
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Apr 07 11:15:56
2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Apr 07 13:07:18
2010 +0200
@@ -20652,6 +20652,17 @@
<!--83138086E1BB4553A01995EE567C1BF5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--83138086E1BB4553A01995EE567C1BF5--></AD_TEXTINTERFACES>
+<!--83A34A4C0D067671E040007F010125A3--><AD_TEXTINTERFACES>
+<!--83A34A4C0D067671E040007F010125A3-->
<AD_TEXTINTERFACES_ID><![CDATA[83A34A4C0D067671E040007F010125A3]]></AD_TEXTINTERFACES_ID>
+<!--83A34A4C0D067671E040007F010125A3-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--83A34A4C0D067671E040007F010125A3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--83A34A4C0D067671E040007F010125A3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--83A34A4C0D067671E040007F010125A3--> <TEXT><![CDATA[Commercial
Module]]></TEXT>
+<!--83A34A4C0D067671E040007F010125A3-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/modules/ModuleBox.srpt]]></FILENAME>
+<!--83A34A4C0D067671E040007F010125A3--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--83A34A4C0D067671E040007F010125A3-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--83A34A4C0D067671E040007F010125A3--></AD_TEXTINTERFACES>
+
<!--8774D7A6B6394D45BCDBF20FE4B98832--><AD_TEXTINTERFACES>
<!--8774D7A6B6394D45BCDBF20FE4B98832-->
<AD_TEXTINTERFACES_ID><![CDATA[8774D7A6B6394D45BCDBF20FE4B98832]]></AD_TEXTINTERFACES_ID>
<!--8774D7A6B6394D45BCDBF20FE4B98832-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6cc47c61b609 -r 5405425e49d3
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Wed Apr
07 11:15:56 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Wed Apr
07 13:07:18 2010 +0200
@@ -1181,24 +1181,39 @@
log4j.error(ex);
}
}
+
+ FieldProvider[] modulesBox = new FieldProvider[0];
if (modules != null && modules.length > 0) {
+ modulesBox = new FieldProvider[modules.length];
+ int i = 0;
+ for (SimpleModule mod : modules) {
+ HashMap<String, String> moduleBox = new HashMap<String, String>();
- for (int i = 0; i < modules.length; i++) {
- String icon = modules[i].getType();
+ // set different icon depending on module type
+ String icon = mod.getType();
icon = (icon == null ? "M" : icon).equals("M") ? "Module" :
icon.equals("T") ? "Template"
: "Pack";
- modules[i].setType(icon);
// If there is no url, we need to hide the 'Visit Site' link and
separator.
- String url = modules[i].getUrl();
- modules[i].setUrl(url == null || url.equals("") ? "HIDDEN" : url);
+ String url = mod.getUrl();
+ url = (url == null || url.equals("") ? "HIDDEN" : url);
+
+ moduleBox.put("name", mod.getName());
+ moduleBox.put("description", mod.getDescription());
+ moduleBox.put("type", icon);
+ moduleBox.put("help", mod.getHelp());
+ moduleBox.put("url", url);
+ moduleBox.put("moduleVersionID", mod.getModuleVersionID());
+ moduleBox.put("commercialStyle", (mod.getIsCommercial() ? "true" :
"none"));
+
+ modulesBox[i] = FieldProviderFactory.getFieldProvider(moduleBox);
+ i++;
}
}
final XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
"org/openbravo/erpCommon/modules/ModuleBox").createXmlDocument();
- FieldProvider[] fieldProviders =
FieldProviderFactory.getFieldProviderArray(modules);
- xmlDocument.setData("structureBox", fieldProviders);
+ xmlDocument.setData("structureBox", modulesBox);
return xmlDocument.print();
}
diff -r 6cc47c61b609 -r 5405425e49d3
src/org/openbravo/erpCommon/modules/ModuleBox.srpt
--- a/src/org/openbravo/erpCommon/modules/ModuleBox.srpt Wed Apr 07
11:15:56 2010 +0200
+++ b/src/org/openbravo/erpCommon/modules/ModuleBox.srpt Wed Apr 07
13:07:18 2010 +0200
@@ -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) 2008 Openbravo SLU
+ * All portions are Copyright (C) 2008-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -23,7 +23,7 @@
<div class="AddModule_Title">
<div class="AddModule_Icon_xx" id="icon"></div>
<div class="AddModule_Text_Title" id="name">xxModuleName</div>
-
+
<div class="AddModule_Button_Install">
<div>
<button type="button"
@@ -48,8 +48,15 @@
</table>
</button>
</div>
+ <div id="commercial" class="AddModule_Commercial"
style="display:xx;">
+ <a class="LabelLink_noicon" target="_blank"
href="http://www.openbravo.com/product/erp/module/acquire/";>Commercial
Module</a>
+ </div>
</div>
</div>
+
+
+
+
<div class="AddModule_Text_Description" id="description">xxdesc</div>
<div class="AddModule_Text_Help" id="help">xxhelp</div>
<div class="AddModule_Options">
diff -r 6cc47c61b609 -r 5405425e49d3
src/org/openbravo/erpCommon/modules/ModuleBox.xml
--- a/src/org/openbravo/erpCommon/modules/ModuleBox.xml Wed Apr 07 11:15:56
2010 +0200
+++ b/src/org/openbravo/erpCommon/modules/ModuleBox.xml Wed Apr 07 13:07:18
2010 +0200
@@ -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) 2008 Openbravo SLU
+ * All portions are Copyright (C) 2008-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -28,6 +28,7 @@
<FIELD id="url" attribute="onclick" replace="xx">url</FIELD>
<FIELD id="details" attribute="onclick"
replace="xx">moduleVersionID</FIELD>
<FIELD id="buttonInstall" attribute="onclick"
replace="xx">moduleVersionID</FIELD>
+ <FIELD id="commercial" attribute="style" replace="xx"
default="none">commercialStyle</FIELD>
<SECTION id="box"/>
</structure>
diff -r 6cc47c61b609 -r 5405425e49d3
web/skins/Default/Main/_ParticularItems/AddModule/iconCommercial.gif
Binary file
web/skins/Default/Main/_ParticularItems/AddModule/iconCommercial.gif has changed
diff -r 6cc47c61b609 -r 5405425e49d3 web/skins/Default/Openbravo_ERP_250.css
--- a/web/skins/Default/Openbravo_ERP_250.css Wed Apr 07 11:15:56 2010 +0200
+++ b/web/skins/Default/Openbravo_ERP_250.css Wed Apr 07 13:07:18 2010 +0200
@@ -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) 2008-2009 Openbravo SLU
+ * All portions are Copyright (C) 2008-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -5401,6 +5401,21 @@
padding: 2 0 2 43;
}
+.AddModule_Commercial {
+ width: 65px;
+ height: 32px;
+ float: left;
+ background-repeat: no-repeat;
+ background-position: left center;
+ background-image: url(Main/_ParticularItems/AddModule/iconCommercial.gif);
+ color: #404040;
+ font-size: 8pt;
+ font-weight: normal;
+ font-family: tahoma,arial,helvetica,sans-serif;
+ padding: 10 0 2 25;
+ float: right;
+}
+
.AddModule_Text_Help {
color: #404040;
font-size: 8pt;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
