Commit 80dd17e4 by Tuukka Kivilahti

Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

2 parents 2a23585b dbbc24c7
...@@ -79,7 +79,7 @@ public class CompoEntry implements EventChildInterface { ...@@ -79,7 +79,7 @@ public class CompoEntry implements EventChildInterface {
private List<CompoEntryParticipant> participants; private List<CompoEntryParticipant> participants;
@JoinColumns( { @JoinColumns( {
@JoinColumn(name = "compo_id", referencedColumnName = "id", nullable = false, updatable = false, insertable = false), @JoinColumn(name = "compo_id", referencedColumnName = "id", nullable = false),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) }) @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
@ManyToOne(optional = false) @ManyToOne(optional = false)
private Compo compo; private Compo compo;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!