Commit c8db7873 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '114-dataset-details-display' into 'master'

Resolve "Dataset details display"

Closes #114

See merge request !107
parents ce4f60df 8b4afc5b
......@@ -85,7 +85,6 @@ public class Dataset extends UuidModel implements Publishable, PublishValidation
private Set<AccessionIdentifier> accessionIdentifiers;
/** The descriptors. */
// FIXME No cascadce
@ManyToMany(fetch = FetchType.LAZY, cascade = {})
@JoinTable(name = "datasetdescriptor", joinColumns = @JoinColumn(name = "datasetId", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "descriptorId", referencedColumnName = "id"))
@OrderColumn(name = "position")
......
......@@ -224,7 +224,7 @@ public class DatasetServiceImpl implements DatasetService {
LOG.warn("Dataset versions don't match anymore");
throw new ConcurrencyFailureException("Object version changed to " + dataset.getVersion() + ", you provided " + input.getVersion());
}
return dataset;
return lazyLoad(dataset);
}
/**
......
Supports Markdown
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