[OpenbravoERP-commits] devel/pi: fixed bug 36074: inconsistent ad_process generates inv...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/42059137939c
changeset: 32155:42059137939c
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed May 24 10:39:33 2017 +0200
summary:   fixed bug 36074: inconsistent ad_process generates invalid web.xml

  Some invalid defintions of ad_process generated invalid web.xml because 
mapping
  was included referencing to a class that was filtered out, causing Tomcat to
  refuse to start.

  It has been fixed by adding to the query that retrieves mappings the same 
restrictions
  already added to the query looking for classes, so mappings will be obtained
  only if class is present.

diffstat:

 src-wad/src/org/openbravo/wad/Wad_data.xsql |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e96d2416282f -r 42059137939c src-wad/src/org/openbravo/wad/Wad_data.xsql
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql       Wed May 24 13:25:52 
2017 +0530
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql       Wed May 24 10:39:33 
2017 +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) 2001-2016 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2017 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -64,11 +64,13 @@
     <Sql>
       <![CDATA[
       SELECT MAX(MO.ACTION || MO.AD_MODEL_OBJECT_ID) AS NAME, MOM.MAPPINGNAME 
AS CLASSNAME, MO.CLASSNAME AS DISPLAYNAME 
-      FROM AD_MODEL_OBJECT MO, AD_MODEL_OBJECT_MAPPING MOM
+      FROM AD_MODEL_OBJECT_MAPPING MOM, 
+           AD_MODEL_OBJECT MO LEFT JOIN AD_Process p ON mo.AD_Process_ID = 
p.AD_Process_ID AND p.isReport='N'
       WHERE mo.ISACTIVE = 'Y' 
       AND MO.OBJECT_TYPE = 'S' 
       AND MO.ACTION != 'W'
-      AND MO.AD_MODEL_OBJECT_ID = MOM.AD_MODEL_OBJECT_ID 
+      AND MO.AD_MODEL_OBJECT_ID = MOM.AD_MODEL_OBJECT_ID
+      AND COALESCE(p.uiPattern,'M') = 'M'
       AND AD_CALLOUT_ID IS NULL
       GROUP BY MO.CLASSNAME, MOM.MAPPINGNAME
       ORDER BY NAME

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits