details: https://code.openbravo.com/erp/devel/pi/rev/ff800550e531
changeset: 16670:ff800550e531
user: Augusto Mauch <augusto.mauch <at> openbravo.com>
date: Mon May 28 12:22:58 2012 +0200
summary: Fixes issue 20337: Message shown if
OBUIAPP_ShowSingleRecordFilterMsg is true
Now, before showing the message, the value of the
OBUIAPP_ShowSingleRecordFilterMsg property is checked.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
| 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (17 lines):
diff -r ba95c4bd8198 -r ff800550e531
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
Mon May 28 12:01:07 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
Mon May 28 12:22:58 2012 +0200
@@ -457,9 +457,10 @@
if (!this.isOpenDirectModeLeaf && !this.view.isShowingForm &&
(this.view.messageBar && !this.view.messageBar.isVisible())) {
showMessageProperty =
OB.PropertyStore.get('OBUIAPP_ShowSingleRecordFilterMsg');
showMessage = showMessageProperty !== 'N' && showMessageProperty !==
'"N"';
-
- this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, '<div><div
style="float: left;">' + OB.I18N.getLabel('OBUIAPP_SingleRecordFilterMsg') +
'<br/>' + OB.I18N.getLabel('OBUIAPP_ClearFilters') + '</div><div style="float:
right; padding-top: 15px;"><a href="#" style="font-weight:normal;
color:inherit;" onclick="' + 'window[\'' + this.view.messageBar.ID +
'\'].hide(); OB.PropertyStore.set(\'OBUIAPP_ShowSingleRecordFilterMsg\',
\'N\');">' + OB.I18N.getLabel('OBUIAPP_NeverShowMessageAgain') +
'</a></div></div>', ' ');
- this.view.messageBar.hasFilterMessage = true;
+ if (showMessage) {
+ this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, '<div><div
style="float: left;">' + OB.I18N.getLabel('OBUIAPP_SingleRecordFilterMsg') +
'<br/>' + OB.I18N.getLabel('OBUIAPP_ClearFilters') + '</div><div style="float:
right; padding-top: 15px;"><a href="#" style="font-weight:normal;
color:inherit;" onclick="' + 'window[\'' + this.view.messageBar.ID +
'\'].hide(); OB.PropertyStore.set(\'OBUIAPP_ShowSingleRecordFilterMsg\',
\'N\');">' + OB.I18N.getLabel('OBUIAPP_NeverShowMessageAgain') +
'</a></div></div>', ' ');
+ this.view.messageBar.hasFilterMessage = true;
+ }
} else if (this.isOpenDirectModeLeaf &&
this.view.messageBar.hasFilterMessage) {
// remove grid message if it was set previously when in direct open
this.view.messageBar.hasFilterMessage = false;
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
