details: /erp/devel/pi/rev/1a27dc7b43f0
changeset: 11477:1a27dc7b43f0
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Apr 05 11:12:13 2011 +0200
summary: [OBUIAPP]Fixed error when user and role doesn't have any alertRule
assigned.
details: /erp/devel/pi/rev/bfea350857f6
changeset: 11478:bfea350857f6
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Apr 05 11:13:08 2011 +0200
summary: [OBUIAPP]Open acknowledged section expanded by default.
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 6 +++++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
| 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (28 lines):
diff -r 9d317b57ee29 -r bfea350857f6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
Tue Apr 05 09:28:07 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
Tue Apr 05 11:13:08 2011 +0200
@@ -187,7 +187,11 @@
filterClause += ' or e.id in ('
+OB.AlertManagement.alertRules[i].alerts + '))';
}
}
- whereClause += ' and alertRule.id in (' + alertRuleIds + ')';
+ if (alertRuleIds !== '') {
+ whereClause += ' and alertRule.id in (' + alertRuleIds + ')';
+ } else {
+ whereClause += ' and 1=2';
+ }
if (filterClause !== '') {
whereClause += filterClause;
}
diff -r 9d317b57ee29 -r bfea350857f6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
Tue Apr 05 09:28:07 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
Tue Apr 05 11:13:08 2011 +0200
@@ -122,7 +122,7 @@
this.sections.Acknowledged = {
title: this.translatedStatus.Acknowledged,
alertStatus: 'Acknowledged',
- expanded: false,
+ expanded: true,
items: [this.grids.Acknowledged],
controls: [this.AcknowledgedNew, this.AcknowledgedSuppressed]};
this.sectionStack.addSection(this.sections.Acknowledged);
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
