extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apparently expandName() can also return null - handle that too

Browse Source
This commit is contained in:
Nathan Gray 2013-09-09 21:39:31 +00:00
parent 2087aed7a3
commit 7b9b5efe7f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/et2_widget_grid.js
View File

@ -253,13 +253,13 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
var ident = content.expandName(value); var ident = content.expandName(value);
var regex = new RegExp("\\[" + content.perspectiveData.row + "\\]"); var regex = new RegExp("\\[" + content.perspectiveData.row + "\\]");
if(ident.match(regex)) if(ident != null && ident.match(regex))
{ {
rowData[rowIndex] = jQuery.extend({}, rowDataEntry); rowData[rowIndex] = jQuery.extend({}, rowDataEntry);
content.perspectiveData.row = ++rowIndex; content.perspectiveData.row = ++rowIndex;
regex = new RegExp("\\[" + content.perspectiveData.row + "\\]"); regex = new RegExp("\\[" + content.perspectiveData.row + "\\]");
} }
} while(ident.match(regex)) } while(ident != null && ident.match(regex))
return; return;
} }
} }