details: /erp/stable/2.50/rev/d8284df7a9d6
changeset: 9452:d8284df7a9d6
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Thu May 26 17:08:58 2011 +0200
summary: Fixed Issue 17376. Ramdom navigation to partner window
details: /erp/stable/2.50/rev/cd0607f1c38d
changeset: 9453:cd0607f1c38d
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Thu May 26 17:16:59 2011 +0200
summary: Fixed Issue 17335. Access to tab-form when running Grant Access
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java | 7 +++++++
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces_data.xsql | 4 ++--
src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diffs (44 lines):
diff -r 58edfd6ed35b -r cd0607f1c38d
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java Wed May
25 10:31:26 2011 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.java Thu May
26 17:16:59 2011 +0200
@@ -173,6 +173,13 @@
InsertAccesData.insertProcess(this, accesData[i].printreport,
roleid, vars
.getClient(), "0", vars.getUser());
}
+ if (!accesData[i].editreference.equals("")
+ && (InsertAccesData.selectForm(this, roleid,
accesData[i].editreference) == null || InsertAccesData
+ .selectForm(this, roleid,
accesData[i].editreference).equals(""))) {
+ log4j.error("Action window fomr tab: " +
accesData[i].editreference);
+ InsertAccesData.insertForm(this, accesData[i].editreference,
roleid, vars
+ .getClient(), "0", vars.getUser());
+ }
InsertAccesData[] buttons =
InsertAccesData.selectWindowButtons(this,
accesData[i].adwindowid, roleid);
if (buttons != null && buttons.length > 0) {
diff -r 58edfd6ed35b -r cd0607f1c38d
src/org/openbravo/erpCommon/ad_actionButton/InsertAcces_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/InsertAcces_data.xsql Wed May
25 10:31:26 2011 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/InsertAcces_data.xsql Thu May
26 17:16:59 2011 +0200
@@ -30,10 +30,10 @@
<![CDATA[
SELECT DISTINCT tn.Node_ID,tn.Parent_ID, m.ISSUMMARY, m.action,
m.AD_WINDOW_ID as adwindowid,
m.AD_PROCESS_ID as adprocessid, m.AD_FORM_ID as adformid,
m.AD_WORKFLOW_ID as adworkflowid,
- m.AD_TASK_ID as adtaskid, tb.ad_process_id as printreport
+ m.AD_TASK_ID as adtaskid, tb.ad_process_id as printreport,
tb.editreference as editreference
FROM AD_TREENODE tn, AD_MENU m left join ad_tab tb
on m.ad_window_id = tb.ad_window_id
- and tb.ad_process_id is not null
+ and (tb.ad_process_id is not null or
tb.editreference is not null)
WHERE tn.NODE_ID = m.AD_MENU_ID
AND tn.ad_tree_id = '10'
AND tn.IsActive='Y'
diff -r 58edfd6ed35b -r cd0607f1c38d
src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql
--- a/src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql Wed May
25 10:31:26 2011 +0000
+++ b/src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql Thu May
26 17:16:59 2011 +0200
@@ -47,6 +47,7 @@
AND T.ISACTIVE = 'Y'
AND W.AD_WINDOW_ID = ?
AND T.AD_TABLE_ID = ?
+ ORDER BY T.TABLEVEL
</Sql>
<Parameter name="adWindowId"/>
<Parameter name="adTableId"/>
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
