python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-03-31 06:33:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Endless cycle if null value has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2018-07-12 00:00:19 +03:00
parent 90ec21d2ab
commit 16249c7f05
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/lrscriptenginemanager.cpp
View File

@ -416,7 +416,7 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
QString fieldValue; QString fieldValue;
varValue = dataManager()->fieldData(field); varValue = dataManager()->fieldData(field);
if (expandType == EscapeSymbols) { if (expandType == EscapeSymbols) {
if (dataManager()->fieldData(field).isNull()) { if (varValue.isNull()) {
fieldValue="\"\""; fieldValue="\"\"";
} else { } else {
fieldValue = escapeSimbols(varValue.toString()); fieldValue = escapeSimbols(varValue.toString());
@ -437,8 +437,8 @@ QString ScriptEngineManager::expandDataFields(QString context, ExpandType expand
fieldValue = replaceHTMLSymbols(varValue.toString()); fieldValue = replaceHTMLSymbols(varValue.toString());
else fieldValue = varValue.toString(); else fieldValue = varValue.toString();
} }
if (varValue.isValid())
context.replace(rx.cap(0),fieldValue); context.replace(rx.cap(0),fieldValue);
} else { } else {
QString error; QString error;