extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check to see if the substitution actually got something, or we could wreck the nextmatch rows.

Browse Source
This commit is contained in:
Nathan Gray 2013-09-09 19:16:05 +00:00
parent 230472d256
commit 2087aed7a3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etemplate/js/et2_widget_grid.js
View File

@ -249,11 +249,17 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
if(value.indexOf('@') > 0 || value.indexOf('$') > 0) if(value.indexOf('@') > 0 || value.indexOf('$') > 0)
{ {
// Ok, we found something. How many? // Ok, we found something. How many?
while(typeof content.expandName(value) !== 'undefined') do {
{ var ident = content.expandName(value);
rowData[rowIndex] = jQuery.extend({}, rowDataEntry); var regex = new RegExp("\\[" + content.perspectiveData.row + "\\]");
content.perspectiveData.row = ++rowIndex;
} if(ident.match(regex))
{
rowData[rowIndex] = jQuery.extend({}, rowDataEntry);
content.perspectiveData.row = ++rowIndex;
regex = new RegExp("\\[" + content.perspectiveData.row + "\\]");
}
} while(ident.match(regex))
return; return;
} }
} }