details: /erp/devel/pi/rev/b7e55cf8773c
changeset: 8444:b7e55cf8773c
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Sun Sep 12 17:18:51 2010 +0200
summary: Fixes issue 14253: Using the link "All" for selecting all the
modules does not activate the Uninstall button
details: /erp/devel/pi/rev/57d4bf060d34
changeset: 8445:57d4bf060d34
user: Valery Lezhebokov <valery.lezhebokov <at> gmail.com>
date: Thu Sep 23 16:01:24 2010 +0200
summary: formatting for b7e55cf8773c
details: /erp/devel/pi/rev/eac2e293ef02
changeset: 8446:eac2e293ef02
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Sep 24 15:32:36 2010 +0200
summary: merge
diffstat:
src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml | 9
+++++----
src-db/database/sourcedata/AD_COLUMN.xml | 2 ++
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html | 2 ++
src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java | 4 ++--
src/org/openbravo/erpCommon/ad_process/ApplyModules.java | 2 +-
web/js/genericTree.js | 10
++++++++--
6 files changed, 20 insertions(+), 9 deletions(-)
diffs (104 lines):
diff -r 0ec9db2b11aa -r eac2e293ef02
src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml
--- a/src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml Thu Sep 23
12:25:41 2010 +0200
+++ b/src-db/database/model/triggers/AD_ELEMENT_TRL_TRG.xml Fri Sep 24
15:32:36 2010 +0200
@@ -38,12 +38,13 @@
IF UPDATING
THEN
IF ( COALESCE (:OLD.NAME, '.') <> COALESCE (:NEW.NAME, '.')
- OR COALESCE (:OLD.Description, '.') <>
- COALESCE (:NEW.Description, '.')
+ OR COALESCE (:OLD.Description, '.') <> COALESCE (:NEW.Description, '.')
OR COALESCE (:OLD.HELP, '.') <> COALESCE (:NEW.HELP, '.')
OR COALESCE (:OLD.PrintName, '.') <> COALESCE (:NEW.PrintName, '.')
- OR COALESCE (:OLD.IsTranslated, '.') <>
- COALESCE (:NEW.IsTranslated, '.')
+ OR COALESCE (:OLD.IsTranslated, '.') <> COALESCE (:NEW.IsTranslated,
'.')
+ OR COALESCE (:OLD.PO_NAME, '.') <> COALESCE (:NEW.PO_NAME, '.')
+ OR COALESCE (:OLD.PO_Description, '.') <> COALESCE
(:NEW.PO_Description, '.')
+ OR COALESCE (:OLD.PO_HELP, '.') <> COALESCE (:NEW.PO_HELP, '.')
)
THEN
-- Field
diff -r 0ec9db2b11aa -r eac2e293ef02 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Sep 23 12:25:41 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Sep 24 15:32:36 2010 +0200
@@ -240013,6 +240013,7 @@
<!--803531--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803531--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--803531--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803531-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803531--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803531--> <SEQNO><![CDATA[30]]></SEQNO>
<!--803531--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -240457,6 +240458,7 @@
<!--803544--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--803544--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--803544--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--803544-->
<READONLYLOGIC><![cda...@docstatus@='CO'|@docsta...@='CL']]></READONLYLOGIC>
<!--803544--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--803544--> <SEQNO><![CDATA[30]]></SEQNO>
<!--803544--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
diff -r 0ec9db2b11aa -r eac2e293ef02
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
Thu Sep 23 12:25:41 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
Fri Sep 24 15:32:36 2010 +0200
@@ -81,6 +81,8 @@
resizeArea();
gt_adjustTreeWidth();
+ // disable the core module checkbox (core module can't be disabled or
uninstalled)
+ document.getElementById("inpNodes_0").disabled=true;
}
function onResizeDo(){
diff -r 0ec9db2b11aa -r eac2e293ef02
src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java
--- a/src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java Thu Sep
23 12:25:41 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java Fri Sep
24 15:32:36 2010 +0200
@@ -224,10 +224,10 @@
* String with text
* @param maxLength
* Maximum Length of content or 0 to ignore
- * @return escaped string for insert statement (NULL if null)
+ * @return escaped string for insert statement (NULL if null or empty)
*/
private String TO_STRING(String txt, int maxLength) {
- if (txt == null)
+ if (txt == null || txt.isEmpty())
return "NULL";
// Length
diff -r 0ec9db2b11aa -r eac2e293ef02
src/org/openbravo/erpCommon/ad_process/ApplyModules.java
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.java Thu Sep 23
12:25:41 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.java Fri Sep 24
15:32:36 2010 +0200
@@ -313,11 +313,11 @@
return nodeData;
} else {
BuildTranslation buildTranslation =
getBuildTranslationFromFile(vars.getLanguage());
- buildTranslation.setBuild(build);
if (buildTranslation == null) {
FieldProvider[] nodeData = build.getFieldProvidersForBuild();
return nodeData;
}
+ buildTranslation.setBuild(build);
FieldProvider[] nodeData =
buildTranslation.getFieldProvidersForBuild();
return nodeData;
}
diff -r 0ec9db2b11aa -r eac2e293ef02 web/js/genericTree.js
--- a/web/js/genericTree.js Thu Sep 23 12:25:41 2010 +0200
+++ b/web/js/genericTree.js Fri Sep 24 15:32:36 2010 +0200
@@ -117,8 +117,14 @@
function gt_selectAllNodes(value){
boxes = gt_getElementsByName('inpNodes','input');
- for (i=0; i<boxes.length; i++)
- boxes[i].checked=value;
+ for (i=0; i<boxes.length; i++){
+ if(boxes[i].disabled == true){
+ continue;
+ }
+ boxes[i].checked=value;
+ }
+ gt_setActiveUninstall('buttonUninstall');
+ gt_setActiveUninstall('buttonDisable');
}
var gt_focusedNode;
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
