Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java =================================================================== diff -u -r7dfa802584b72c21927df5f28425ee7939fcc9c5 -rf2b4bc8c20ba17a32f4065e4f1fbeed64cf39b78 --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision 7dfa802584b72c21927df5f28425ee7939fcc9c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java (.../Kumalive.java) (revision f2b4bc8c20ba17a32f4065e4f1fbeed64cf39b78) @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -51,21 +50,21 @@ @Column(name = "kumalive_id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long kumaliveId; - - @ManyToOne(optional=false) + + @ManyToOne(optional = false) @JoinColumn(name = "organisation_id") private Organisation organisation; - + @ManyToOne - @JoinColumn(name = "create_by") + @JoinColumn(name = "created_by") private User createdBy; - + @Column private String name; - + @Column private Boolean finished = false; - + @OneToMany(fetch = FetchType.EAGER) @JoinColumn(name = "kumalive_id") @OrderBy("order_id ASC")