details: /erp/devel/pi/rev/46654f8836c7
changeset: 10314:46654f8836c7
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 02 12:25:34 2011 +0100
summary: [process] Get tab url without termination (Edtion/Relation).html
details: /erp/devel/pi/rev/6a70ad69caba
changeset: 10315:6a70ad69caba
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 02 12:26:46 2011 +0100
summary: [process] Added 2.50 mapping in tab definition
details: /erp/devel/pi/rev/089fd90320fb
changeset: 10316:089fd90320fb
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 02 12:27:17 2011 +0100
summary: [process] When closing process, do not open current tab in classic
mode
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 4 ++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 4 ++++
src/org/openbravo/erpCommon/utility/Utility.java
| 2 ++
4 files changed, 11 insertions(+), 0 deletions(-)
diffs (51 lines):
diff -r d0a8b2c0d6ce -r 089fd90320fb
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Feb 02 11:59:50 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Feb 02 12:27:17 2011 +0100
@@ -32,6 +32,7 @@
</#if>
defaultEditMode: ${tabComponent.defaultEditMode},
+ mapping250: '${tabComponent.mapping250?js_string}',
standardProperties:{
inpTabId: '${tabComponent.tabId}',
diff -r d0a8b2c0d6ce -r 089fd90320fb
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Wed Feb 02 11:59:50 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Wed Feb 02 12:27:17 2011 +0100
@@ -100,6 +100,10 @@
return tab.isDefaultEditMode() == null ? "false" :
Boolean.toString(tab.isDefaultEditMode());
}
+ public String getMapping250() {
+ return Utility.getTabURL(tab.getId(), "none", false);
+ }
+
public List<ButtonField> getButtonFields() {
if (buttonFields != null) {
return buttonFields;
diff -r d0a8b2c0d6ce -r 089fd90320fb
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
Wed Feb 02 11:59:50 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
Wed Feb 02 12:27:17 2011 +0100
@@ -112,6 +112,10 @@
newWindow = '/'+newWindow;
}
+ if (newWindow.startsWith(theView.mapping250)) {
+ // Refreshing current tab, do not open it again.
+ return;
+ }
var windowParams = {
viewId : this.title,
tabTitle: this.title,
diff -r d0a8b2c0d6ce -r 089fd90320fb
src/org/openbravo/erpCommon/utility/Utility.java
--- a/src/org/openbravo/erpCommon/utility/Utility.java Wed Feb 02 11:59:50
2011 +0100
+++ b/src/org/openbravo/erpCommon/utility/Utility.java Wed Feb 02 12:27:17
2011 +0100
@@ -2362,6 +2362,8 @@
url += "_Relation.html";
} else if ("X".equals(type)) {
url += "_Excel.html";
+ } else if ("none".equals(type)) {
+ // do nothing
} else {
url += "_Edition.html";
}
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
