mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2025-03-28 05:03:51 +03:00
Endless cycle if null value has been fixed
This commit is contained in:
parent
90ec21d2ab
commit
16249c7f05
@ -416,7 +416,7 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
|
||||
QString fieldValue;
|
||||
varValue = dataManager()->fieldData(field);
|
||||
if (expandType == EscapeSymbols) {
|
||||
if (dataManager()->fieldData(field).isNull()) {
|
||||
if (varValue.isNull()) {
|
||||
fieldValue="\"\"";
|
||||
} else {
|
||||
fieldValue = escapeSimbols(varValue.toString());
|
||||
@ -437,8 +437,8 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
|
||||
fieldValue = replaceHTMLSymbols(varValue.toString());
|
||||
else fieldValue = varValue.toString();
|
||||
}
|
||||
if (varValue.isValid())
|
||||
context.replace(rx.cap(0),fieldValue);
|
||||
|
||||
context.replace(rx.cap(0),fieldValue);
|
||||
|
||||
} else {
|
||||
QString error;
|
||||
|
Loading…
Reference in New Issue
Block a user