holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional checks on autorepeat fallback

Browse Source 
- Better handling of the different accepted indirect placeholders
- Add a check & error to prevent infinite loops (or crazy large grids)
This commit is contained in:
Nathan Gray 2013-09-10 23:25:51 +00:00
parent f10da7b36d
commit 871f63a9f2
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etemplate/js/et2_widget_grid.js
View File

@ -263,13 +263,29 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
// and it would break nextmatch
if(value.indexOf('@') > 0 || value.indexOf('$') > 0)
{
// Ok, we found something. How many?
// Ok, we found something. How many? Check for values.
var ident = content.expandName(value);
while(ident != null)
// expandName() handles index into content (@), but we have to look up
// regular values
if(value.indexOf('@') < 0)
{
// Returns null if there isn't an actual value
ident = content.getEntry(ident,false,true);
}
while(ident != null && rowIndex < 1000)
{
rowData[rowIndex] = jQuery.extend({}, rowDataEntry);
content.perspectiveData.row = ++rowIndex;
ident = content.expandName(value);
if(value.indexOf('@') < 0)
{
// Returns null if there isn't an actual value
ident = content.getEntry(ident,false,true);
}
}
if(rowIndex >= 1000)
{
egw.debug("error", "Problem in autorepeat fallback: too many rows for '%s'. Use a nextmatch, or start debugging.",value);
}
return;
}