details: https://code.openbravo.com/erp/devel/pi/rev/8c06c502c2b6
changeset: 18971:8c06c502c2b6
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed Dec 05 10:54:26 2012 +0100
summary: Fixed bug 22403: Tree not properly updated
diffstat:
src/org/openbravo/erpCommon/utility/WindowTreeUtility.java | 2 +-
src/org/openbravo/erpCommon/utility/WindowTree_data.xsql | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (33 lines):
diff -r a895b65c70a1 -r 8c06c502c2b6
src/org/openbravo/erpCommon/utility/WindowTreeUtility.java
--- a/src/org/openbravo/erpCommon/utility/WindowTreeUtility.java Wed Dec
05 10:34:39 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/WindowTreeUtility.java Wed Dec
05 10:54:26 2012 +0100
@@ -155,7 +155,7 @@
data = WindowTreeData.selectAsset(conn, strEditable, strParentID,
strNodeId, TreeID);
else if (TreeType.equals("OBRE_RC"))
data = WindowTreeData.selectOBRE_ResouceCategory(conn,
"OBRE_Resource_Category_ID",
- "OBRE_Resource_Category", TreeID);
+ "OBRE_Resource_Category", TreeID, strEditable, strParentID,
strNodeId);
return data;
}
diff -r a895b65c70a1 -r 8c06c502c2b6
src/org/openbravo/erpCommon/utility/WindowTree_data.xsql
--- a/src/org/openbravo/erpCommon/utility/WindowTree_data.xsql Wed Dec 05
10:34:39 2012 +0100
+++ b/src/org/openbravo/erpCommon/utility/WindowTree_data.xsql Wed Dec 05
10:54:26 2012 +0100
@@ -290,12 +290,16 @@
WHERE 1=1
AND tn.Node_ID = a.A_Asset_ID
AND tn.AD_Tree_ID = ?
+ AND 2=2
ORDER BY COALESCE(tn.Parent_ID, '-1'), tn.SeqNo
</Sql>
<Parameter name="columnname" optional="false" type="replace"
after="tn.SeqNo, a." text="A_Asset_ID"/>
<Parameter name="tablename" optional="false" type="replace"
after="AD_TreeNode tn, " text="A_Asset"/>
- <Parameter name="columnname" optional="false" type="replace"
after="AND tn.Node_ID = a." text="A_Asset_ID"/>
+ <Parameter name="columnname" optional="false" type="replace"
after="AND tn.Node_ID = a." text="A_Asset_ID"/>
<Parameter name="adTreeId"/>
+ <Parameter name="editable" optional="true" type="none" after="AND 2=2
" text="AND tn.IsActive='Y' AND a.isActive='Y' "/>
+ <Parameter name="parentId" optional="true" after="AND 2=2 " text="AND
tn.Parent_ID = ? "/>
+ <Parameter name="nodeId" optional="true" after="AND 2=2 " text="AND
tn.Node_ID = ? "/>
</SqlMethod>
<SqlMethod name="selectTreeID" type="preparedStatement" return="multiple">
<SqlMethodComment></SqlMethodComment>
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
