details: /erp/devel/pi/rev/31e0a07adc7b
changeset: 11376:31e0a07adc7b
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Mar 25 14:47:27 2011 +0100
summary: [OBUIAPP] Remove isFixed='N' clause from sql
details: /erp/devel/pi/rev/33cbe1bb75d6
changeset: 11377:33cbe1bb75d6
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Mar 28 10:56:26 2011 +0200
summary: [OBUIAPP] Move createBodies function to ob-grid.js
details: /erp/devel/pi/rev/f49bbf3de321
changeset: 11378:f49bbf3de321
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Mon Mar 28 10:56:58 2011 +0200
summary: [OBUIAPP] Prevent NPE when alert rule does not have tabId defined.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
| 12 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 12 +---------
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 10 ++++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 10 --------
4 files changed, 19 insertions(+), 25 deletions(-)
diffs (95 lines):
diff -r dfbe95b06ab6 -r f49bbf3de321
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
Sat Mar 26 19:44:52 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
Mon Mar 28 10:56:58 2011 +0200
@@ -109,7 +109,11 @@
JSONObject alertRuleJson = new JSONObject();
alertRuleJson.put("name", alertRule.getIdentifier());
alertRuleJson.put("alertRuleId", alertRule.getId());
- alertRuleJson.put("tabId", alertRule.getTab().getId());
+ if (alertRule.getTab() != null) {
+ alertRuleJson.put("tabId", alertRule.getTab().getId());
+ } else {
+ alertRuleJson.put("tabId", "");
+ }
String filterClause = null;
if (alertRule.getFilterClause() != null) {
try {
@@ -118,9 +122,9 @@
} catch (ServletException e) {
throw new IllegalStateException(e);
}
- final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + "
AND ISFIXED ='N'"
- + " AND AD_CLIENT_ID " +
OBDal.getInstance().getReadableClientsInClause()
- + " AND AD_ORG_ID " +
OBDal.getInstance().getReadableOrganizationsInClause()
+ final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + "
AND AD_CLIENT_ID "
+ + OBDal.getInstance().getReadableClientsInClause() + " AND
AD_ORG_ID "
+ + OBDal.getInstance().getReadableOrganizationsInClause()
+ " AND AD_ALERTRULE_ID = ? " + (filterClause == null ? "" :
filterClause);
final SQLQuery sqlQuery =
OBDal.getInstance().getSession().createSQLQuery(sql)
.addEntity(Alert.ENTITY_NAME);
diff -r dfbe95b06ab6 -r f49bbf3de321
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
Sat Mar 26 19:44:52 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
Mon Mar 28 10:56:58 2011 +0200
@@ -192,21 +192,11 @@
tabId = OB.AlertManagement.alertRules[i].tabId;
}
}
- if (field.isLink && tabId) {
+ if (field.isLink && tabId && tabId !== '') {
OB.Utilities.openDirectTab(tabId, record.referenceSearchKey);
}
},
- // Prevents empty message to be shown in frozen part
- // http://forums.smartclient.com/showthread.php?p=57581
- createBodies: function(){
- var ret = this.Super('createBodies', arguments);
- if (this.frozenBody) {
- this.frozenBody.showEmptyMessage = false;
- }
- return ret;
- },
-
selectionChanged: function(record, state){
this.updateSelectedCountDisplay();
this.Super('selectionChanged', arguments);
diff -r dfbe95b06ab6 -r f49bbf3de321
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Sat Mar 26 19:44:52 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Mon Mar 28 10:56:58 2011 +0200
@@ -375,6 +375,16 @@
}
}
return this.Super('editorKeyDown', arguments);
+ },
+
+ // Prevents empty message to be shown in frozen part
+ // http://forums.smartclient.com/showthread.php?p=57581
+ createBodies: function(){
+ var ret = this.Super('createBodies', arguments);
+ if (this.frozenBody) {
+ this.frozenBody.showEmptyMessage = false;
+ }
+ return ret;
}
});
diff -r dfbe95b06ab6 -r f49bbf3de321
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Sat Mar 26 19:44:52 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Mon Mar 28 10:56:58 2011 +0200
@@ -601,16 +601,6 @@
}
},
- // Prevents empty message to be shown in frozen part
- // http://forums.smartclient.com/showthread.php?p=57581
- createBodies: function(){
- var ret = this.Super('createBodies', arguments);
- if (this.frozenBody) {
- this.frozenBody.showEmptyMessage = false;
- }
- return ret;
- },
-
selectRecordById: function(id, forceFetch){
if (forceFetch) {
this.targetRecordId = id;
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
