Commit 35ed042b authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1379-hypothetical-compolex-info' into 'devel_15.1.x'

info about hypothetical and activity status added to REST API

See merge request !1252
parents f62f161c f8b87e26
Pipeline #33554 passed with stage
in 13 minutes
minerva (15.1.0) unstable; urgency=medium
* Small improvement: information if species has activity, hypothetical flag
set is available over REST API for element (#1379)
* Bug fix: MolArt version upgraded to handle new protein API syntax (#1399)
* Bug fix: LDAP connection did not work properly where uid in LDAP/AD
contained upper case letters (#1404)
......
......@@ -182,6 +182,16 @@ public class ElementsRestImpl extends BaseRestImpl {
value = ((Species) element).isConstant();
}
break;
case "hypothetical":
if (element instanceof Species) {
value = ((Species) element).isHypothetical();
}
break;
case "activity":
if (element instanceof Species) {
value = ((Species) element).getActivity();
}
break;
case "references":
value = createAnnotations(element.getMiriamData());
break;
......@@ -357,6 +367,8 @@ public class ElementsRestImpl extends BaseRestImpl {
columnsSet.add("initialConcentration");
columnsSet.add("boundaryCondition");
columnsSet.add("constant");
columnsSet.add("hypothetical");
columnsSet.add("activity");
columnsSet.add("initialAmount");
columnsSet.add("glyph");
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment