fixed not detected number of autorepeated rows for id like "${row}@[name]" addressing first column, gave error "Problem in autorepeat fallback: too many rows"

This commit is contained in:
Ralf Becker 2016-02-13 16:25:50 +00:00
parent ab3e235ed6
commit 40cb207afa

View File

@ -288,7 +288,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
var ident = content.expandName(value); var ident = content.expandName(value);
// expandName() handles index into content (@), but we have to look up // expandName() handles index into content (@), but we have to look up
// regular values // regular values
if(value.indexOf('@') < 0) if(value[0] != '@')
{ {
// Returns null if there isn't an actual value // Returns null if there isn't an actual value
ident = content.getEntry(ident,false,true); ident = content.getEntry(ident,false,true);
@ -298,7 +298,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
rowData[rowIndex] = jQuery.extend({}, rowDataEntry); rowData[rowIndex] = jQuery.extend({}, rowDataEntry);
content.perspectiveData.row = ++rowIndex; content.perspectiveData.row = ++rowIndex;
ident = content.expandName(value); ident = content.expandName(value);
if(value.indexOf('@') < 0) if(value[0] != '@')
{ {
// Returns null if there isn't an actual value // Returns null if there isn't an actual value
ident = content.getEntry(ident,false,true); ident = content.getEntry(ident,false,true);