frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Fixing "Required" Tag (#140)

Browse Source 
ok ich merge mal ... passt ja soweit
This commit is contained in:
Paulchen-Panther 2016-07-26 14:53:27 +02:00 committed by redPanther
parent 6840d93206
commit b7d1fbf378
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
View File

@ -180,7 +180,7 @@ void QJsonSchemaChecker::checkProperties(const QJsonObject & value, const QJsonO
{ {
validate(value[property], propertyValue.toObject()); validate(value[property], propertyValue.toObject());
} }
else if (required != schema.end() && required.value().toBool()) else if (required != propertyValue.toObject().end() && required.value().toBool())
{ {
_error = true; _error = true;
setMessage("missing member"); setMessage("missing member");
@ -208,7 +208,7 @@ void QJsonSchemaChecker::checkAdditionalProperties(const QJsonObject & value, co
} }
else else
{ {
validate(value[property], schema.toObject()); validate(value[property].toObject(), schema.toObject());
} }
_currentPath.pop_back(); _currentPath.pop_back();
} }
@ -372,4 +372,4 @@ void QJsonSchemaChecker::checkEnum(const QJsonValue & value, const QJsonValue &
QString strJson(doc.toJson(QJsonDocument::Compact)); QString strJson(doc.toJson(QJsonDocument::Compact));
oss << strJson.toStdString() << ")"; oss << strJson.toStdString() << ")";
setMessage(oss.str()); setMessage(oss.str());
} }