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

Wait on parsing boolean attributes with ${row} if we're not actually in a row, same as string attributes.

Browse Source 
Fixes boolean attributes don't follow $row values
This commit is contained in:
nathan 2022-03-09 10:16:40 -07:00
parent d8517edafa
commit 4d25d2ea8b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/js/etemplate/et2_core_arrayMgr.ts
View File

@ -351,6 +351,13 @@ export class et2_arrayMgr
parseBoolExpression(_expression : string) parseBoolExpression(_expression : string)
{ {
// Check whether "$" occurs in the given identifier, don't parse rows if we're not in a row
// This saves booleans in repeating rows from being parsed too early - we'll parse again when repeating
if(_expression.indexOf('$') >= 0 && this.perspectiveData.row == null && _expression.match(/\$\{?row\}?/))
{
return _expression;
}
// If the first char of the expression is a '!' this means, that the value // If the first char of the expression is a '!' this means, that the value
// is to be negated. // is to be negated.
if(_expression.charAt(0) == '!') if(_expression.charAt(0) == '!')