Skip to content
Snippets Groups Projects
Commit 4988aa3f authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

Merge branch 'f-issue-166' into 'dev'

FIX for #166

See merge request !88
parents a2650724 0850b4a1
Branches
Tags
2 merge requests!96DOC: Added CITATION.cff to the list of files in the release guide where the...,!88FIX for #166
Pipeline #35175 passed
...@@ -32,6 +32,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -32,6 +32,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### ### Fixed ###
* Missing RecordType leads to unexpected server error
[#166](https://gitlab.com/caosdb/caosdb-server/-/issues/166)
### Security ### ### Security ###
### Documentation ### ### Documentation ###
......
...@@ -555,7 +555,7 @@ public abstract class Job { ...@@ -555,7 +555,7 @@ public abstract class Job {
* *
* @param entity the entity to be resolved. * @param entity the entity to be resolved.
* @return the resolved entity. * @return the resolved entity.
* @throws EntityWasNotUniqueException if the resolution failed due to ambuiguity of the name. * @throws EntityWasNotUniqueException if the resolution failed due to ambiguity of the name.
*/ */
protected EntityInterface resolve(final EntityInterface entity) protected EntityInterface resolve(final EntityInterface entity)
throws EntityWasNotUniqueException { throws EntityWasNotUniqueException {
......
...@@ -119,7 +119,7 @@ public class Inheritance extends EntityJob { ...@@ -119,7 +119,7 @@ public class Inheritance extends EntityJob {
} }
// implement properties // implement properties
if (getEntity().hasProperties()) { if (getEntity().getEntityStatus() == EntityStatus.QUALIFIED && getEntity().hasProperties()) {
propertyLoop: propertyLoop:
for (final Property property : getEntity().getProperties()) { for (final Property property : getEntity().getProperties()) {
final ArrayList<Property> transfer = new ArrayList<>(); final ArrayList<Property> transfer = new ArrayList<>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment