details: https://code.openbravo.com/erp/devel/pi/rev/b42654f43606
changeset: 15942:b42654f43606
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Mar 29 14:06:07 2012 +0200
summary: fixed bug 20145: Linked items to RO tabs allow to add/delete records
Added readOnly and singleRecod information to linked items open action
in order to properly display toolbar.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
| 2 +-
src/org/openbravo/erpCommon/utility/UsedByLink.java
| 2 ++
src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql
| 8 +++++---
3 files changed, 8 insertions(+), 4 deletions(-)
diffs (56 lines):
diff -r b3016d7a95ea -r b42654f43606
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
Thu Mar 29 13:41:43 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js
Thu Mar 29 14:06:07 2012 +0200
@@ -224,7 +224,7 @@
* Opens linked item in a new window
*/
openLinkedItemInNewWindow: function (record) {
- OB.Utilities.openView(record.adWindowId, record.adTabId,
record.adMenuName, record.id, 'DIRECT');
+ OB.Utilities.openView(record.adWindowId, record.adTabId,
record.adMenuName, record.id, 'DIRECT', null, record.readOnly,
record.singleRecord);
},
/**
diff -r b3016d7a95ea -r b42654f43606
src/org/openbravo/erpCommon/utility/UsedByLink.java
--- a/src/org/openbravo/erpCommon/utility/UsedByLink.java Thu Mar 29
13:41:43 2012 +0200
+++ b/src/org/openbravo/erpCommon/utility/UsedByLink.java Thu Mar 29
14:06:07 2012 +0200
@@ -522,6 +522,8 @@
usedByLinkDataJsonObj.put("total", data.total);
usedByLinkDataJsonObj.put("whereClause", data.whereclause);
usedByLinkDataJsonObj.put("windowName", data.windowname);
+ usedByLinkDataJsonObj.put("singleRecord", "SR".equals(data.uipattern));
+ usedByLinkDataJsonObj.put("readOnly", "RO".equals(data.uipattern));
usedByLinkDataJsonObjects.add(usedByLinkDataJsonObj);
}
diff -r b3016d7a95ea -r b42654f43606
src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql
--- a/src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql Thu Mar 29
13:41:43 2012 +0200
+++ b/src/org/openbravo/erpCommon/utility/UsedByLink_data.xsql Thu Mar 29
14:06:07 2012 +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-2011 Openbravo SLU
+ * All portions are Copyright (C) 2001-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -42,7 +42,8 @@
ELSE 'Y'
END) AS ACCESSIBLE,
W.AD_WINDOW_ID as AD_WINDOW_ID,
- '' as AD_MENU_NAME
+ '' as AD_MENU_NAME,
+ '' as UIPATTERN
FROM (
SELECT AD_COLUMN_ID, ? as referenced_column_id
FROM AD_COLUMN
@@ -196,7 +197,8 @@
tab1.AD_TAB_ID AS AD_TAB_ID,
tab1.AD_WINDOW_ID AS AD_WINDOW_ID,
table1.NAME AS TABLENAME,
- menu1.NAME AS AD_MENU_NAME
+ menu1.NAME AS AD_MENU_NAME,
+ tab1.UIPATTERN
FROM AD_WINDOW
LEFT OUTER JOIN AD_TAB tab1 ON (tab1.AD_TAB_ID = TO_CHAR(?))
LEFT OUTER JOIN AD_TABLE table1 ON (tab1.AD_TABLE_ID =
table1.AD_TABLE_ID)
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
