Skip to content
Snippets Groups Projects
Commit 5accd734 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix json

parent 7e35eb50
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 3 deletions
Common/onelab.h
+ 5
− 3
View file @ 5accd734
...@@ -330,7 +330,7 @@ namespace onelab{ ...@@ -330,7 +330,7 @@ namespace onelab{
<< ", \"name\":\"" << sanitize(getName()) << "\"" << ", \"name\":\"" << sanitize(getName()) << "\""
<< ", \"label\":\"" << sanitize(getLabel()) << "\"" << ", \"label\":\"" << sanitize(getLabel()) << "\""
<< ", \"help\":\"" << sanitize(getHelp()) << "\"" << ", \"help\":\"" << sanitize(getHelp()) << "\""
<< ", \"changedValue\":" << getChangedValue() << "\"" << ", \"changedValue\":" << getChangedValue()
<< ", \"visible\":" << (getVisible() ? "true" : "false") << ", \"visible\":" << (getVisible() ? "true" : "false")
<< ", \"readOnly\":" << (getReadOnly() ? "true" : "false") << ", \"readOnly\":" << (getReadOnly() ? "true" : "false")
<< ", \"attributes\":{ "; << ", \"attributes\":{ ";
...@@ -858,11 +858,13 @@ namespace onelab{ ...@@ -858,11 +858,13 @@ namespace onelab{
for(std::set<parameter*, parameterLessThan>::const_iterator it = ps.begin(); for(std::set<parameter*, parameterLessThan>::const_iterator it = ps.begin();
it != ps.end(); it++){ it != ps.end(); it++){
if(client.empty() || (*it)->hasClient(client)){ if(client.empty() || (*it)->hasClient(client)){
if((*it)->getAttribute("NotInDb") != "True") if((*it)->getAttribute("NotInDb") != "True"){
if(it != ps.begin()) json += ", ";
json += " " + (*it)->toJSON() + "\n"; json += " " + (*it)->toJSON() + "\n";
}
} }
} }
json += "] }\n"; json += "] }\n}\n";
} }
}; };
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment