details: /erp/devel/pi/rev/1bc65959fd80
changeset: 10464:1bc65959fd80
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 09 12:28:11 2011 +0100
summary: fixed bug 15864: 'Show Audit Trail' in Community Edition, link is
incorrect
details: /erp/devel/pi/rev/94a11e5a4603
changeset: 10465:94a11e5a4603
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 09 13:44:43 2011 +0100
summary: [process] Don't use non-standard location.origin for closing poup
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 8 +++-----
src-db/database/sourcedata/AD_MESSAGE.xml
| 2 +-
src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html
| 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diffs (43 lines):
diff -r 11ca56569ffd -r 94a11e5a4603
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 09 13:41:01 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
Wed Feb 09 13:44:43 2011 +0100
@@ -93,12 +93,10 @@
OB.ActionButton.executingProcess = null;
if (newWindow) {
- if (newWindow.indexOf(location.origin) !== -1){
- newWindow = newWindow.substr(location.origin.length);
- }
+ var contextURL = location.href.substr(0,
location.href.indexOf(OB.Application.contextUrl) +
OB.Application.contextUrl.length);
- if (newWindow.startsWith(OB.Application.contextUrl)){
- newWindow = newWindow.substr(OB.Application.contextUrl.length);
+ if (newWindow.indexOf(contextURL) !== -1){
+ newWindow = newWindow.substr(contextURL.length);
}
if (!newWindow.startsWith('/')){
diff -r 11ca56569ffd -r 94a11e5a4603 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 09 13:41:01 2011 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Wed Feb 09 13:44:43 2011 +0100
@@ -29835,7 +29835,7 @@
<!--11509F0E2D6E4D4A96518FECB69A5B8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--11509F0E2D6E4D4A96518FECB69A5B8F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--11509F0E2D6E4D4A96518FECB69A5B8F-->
<VALUE><![CDATA[LearnHowToActivate]]></VALUE>
-<!--11509F0E2D6E4D4A96518FECB69A5B8F--> <MSGTEXT><![CDATA[<a
href='http://www.openbravo.com/product/erp/module/acquire'
target='_blank'>Learn how to</a> activate your instance.]]></MSGTEXT>
+<!--11509F0E2D6E4D4A96518FECB69A5B8F--> <MSGTEXT><![CDATA[<a
href='http://www.openbravo.com/product/erp/get-basic' target='_blank'>Learn how
to</a> activate your instance.]]></MSGTEXT>
<!--11509F0E2D6E4D4A96518FECB69A5B8F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--11509F0E2D6E4D4A96518FECB69A5B8F-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--11509F0E2D6E4D4A96518FECB69A5B8F--></AD_MESSAGE>
diff -r 11ca56569ffd -r 94a11e5a4603
src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html
--- a/src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html Wed Feb
09 13:41:01 2011 +0100
+++ b/src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html Wed Feb
09 13:44:43 2011 +0100
@@ -211,7 +211,7 @@
<td class="PlainText_normal" colspan="4" style="padding: 0 0 10
0; text-align: left;">
<p class="Label_ReadOnly_Text" id="info"></p>
<p> </p>
- <p><a class="Label_ReadOnly_Text LabelLink_noicon"
href="http://www.openbravo.com/product/erp/module/acquire"; target="_blank"
id=link1></a> <FIELD_TMP id="link2"></FIELD_TMP</p>
+ <p><a class="Label_ReadOnly_Text LabelLink_noicon"
href="http://www.openbravo.com/product/erp/get-basic"; target="_blank"
id=link1></a> <FIELD_TMP id="link2"></FIELD_TMP</p>
<br/>
</td>
</tr>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
