details: /erp/devel/pi/rev/c0be2f04866b
changeset: 11241:c0be2f04866b
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Mar 14 21:09:31 2011 +0100
summary: Related to issue 16202: Create New / Quick Launch saves any string
pasted in it next time you open it
details: /erp/devel/pi/rev/2f2386107070
changeset: 11242:2f2386107070
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Mar 14 21:11:06 2011 +0100
summary: Set correct labels on deep link popup
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 22 ++++++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 16 ++++++-
3 files changed, 37 insertions(+), 2 deletions(-)
diffs (72 lines):
diff -r 53bfc6bae249 -r 2f2386107070
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Mar 14 19:56:20 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Mar 14 21:11:06 2011 +0100
@@ -1586,4 +1586,26 @@
<!--FF8081812EB3E4F7012EB3EBFDC6000A-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812EB3E4F7012EB3EBFDC6000A--></AD_MESSAGE>
+<!--FF8081812EB5E3EC012EB5E7DF480009--><AD_MESSAGE>
+<!--FF8081812EB5E3EC012EB5E7DF480009-->
<AD_MESSAGE_ID><![CDATA[FF8081812EB5E3EC012EB5E7DF480009]]></AD_MESSAGE_ID>
+<!--FF8081812EB5E3EC012EB5E7DF480009-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812EB5E3EC012EB5E7DF480009--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812EB5E3EC012EB5E7DF480009--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812EB5E3EC012EB5E7DF480009-->
<VALUE><![CDATA[OBUIAPP_PasteLink]]></VALUE>
+<!--FF8081812EB5E3EC012EB5E7DF480009--> <MSGTEXT><![CDATA[Paste link in email
or IM]]></MSGTEXT>
+<!--FF8081812EB5E3EC012EB5E7DF480009--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081812EB5E3EC012EB5E7DF480009-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812EB5E3EC012EB5E7DF480009--></AD_MESSAGE>
+
+<!--FF8081812EB5E3EC012EB5E85D81000D--><AD_MESSAGE>
+<!--FF8081812EB5E3EC012EB5E85D81000D-->
<AD_MESSAGE_ID><![CDATA[FF8081812EB5E3EC012EB5E85D81000D]]></AD_MESSAGE_ID>
+<!--FF8081812EB5E3EC012EB5E85D81000D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812EB5E3EC012EB5E85D81000D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812EB5E3EC012EB5E85D81000D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812EB5E3EC012EB5E85D81000D-->
<VALUE><![CDATA[OBUIAPP_DeepLinkNote]]></VALUE>
+<!--FF8081812EB5E3EC012EB5E85D81000D--> <MSGTEXT><![CDATA[Note: this link can
be pasted in the Quick Launch field to open the tab/record in an existing
Openbravo environment.]]></MSGTEXT>
+<!--FF8081812EB5E3EC012EB5E85D81000D--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081812EB5E3EC012EB5E85D81000D-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812EB5E3EC012EB5E85D81000D--></AD_MESSAGE>
+
</data>
diff -r 53bfc6bae249 -r 2f2386107070
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
Mon Mar 14 19:56:20 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
Mon Mar 14 21:11:06 2011 +0100
@@ -80,6 +80,7 @@
this.members[0].setFields(newFields);
this.layout.showMember(this.members[0]);
this.members[1].getField('value').setValue(null);
+ this.members[1].getField('value').setElementValue('', null);
}
},
diff -r 53bfc6bae249 -r 2f2386107070
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Mar 14 19:56:20 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Mar 14 21:11:06 2011 +0100
@@ -229,13 +229,25 @@
var form = isc.OBViewForm.create({
width: 390,
height: 1,
+ numCols: 1,
overflow: 'visible',
fields: [{
type: 'OBTextAreaItem', selectOnFocus: true,
width: 390, height: 50, canFocus: true,
name:'url',
- title: OB.I18N.getLabel('OBUIAPP_URL'), value: url}
- ],
+ title: OB.I18N.getLabel('OBUIAPP_PasteLink'), value: url},
+ {
+ type: 'CanvasItem', showTitle: false,
+ width: '100%', height: 1, overFlow: 'visible',
+ cellStyle: 'OBFormField',
+ titleStyle: 'OBFormFieldLabel',
+ textBoxStyle: 'OBFormFieldInput',
+ name:'url', canvas: isc.Label.create({
+ width: 360,
+ contents: OB.I18N.getLabel('OBUIAPP_DeepLinkNote'), height: 1,
overflow: 'visible'
+ })
+ }
+ ],
show: function() {
var fld = this.getFields()[0];
this.setFocusItem(fld);
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
