From: <b_c...@us...> - 2013-02-01 18:25:12
|
Revision: 6847 http://jaffa.svn.sourceforge.net/jaffa/?rev=6847&view=rev Author: b_calderwood Date: 2013-02-01 18:25:05 +0000 (Fri, 01 Feb 2013) Log Message: ----------- Merge from 5_10_RELEASE Modified Paths: -------------- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js Modified: trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js =================================================================== --- trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2013-02-01 18:19:46 UTC (rev 6846) +++ trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingStore.js 2013-02-01 18:25:05 UTC (rev 6847) @@ -554,11 +554,11 @@ if(Ext.isArray(this.groupField)) for(var i=0;i<this.groupField.length;i++) { f=meta(this.groupField[i]); - sort[sort.length] = {fieldName: f.sortFieldName||this.groupField[i], sortAscending: f.sortDir=='ASC' }; + if (f) sort[sort.length] = {fieldName: f.sortFieldName||this.groupField[i], sortAscending: f.sortDir=='ASC' }; } else { f=meta(this.groupField); - sort[sort.length] = {fieldName: f.sortFieldName||this.groupField, sortAscending: f.sortDir=='ASC' }; + if (f) sort[sort.length] = {fieldName: f.sortFieldName||this.groupField, sortAscending: f.sortDir=='ASC' }; } } if(this.sortInfo && this.remoteSort){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |