Skip to content
Snippets Groups Projects
Commit c4bdab6b authored by Eirik Steira's avatar Eirik Steira
Browse files

Merge branch 'tag-fix' into 'dev'

bugfix in image models

See merge request !143
parents 1d605c36 1cb30559
No related branches found
No related tags found
2 merge requests!165Weekly merge to Master,!143bugfix in image models
Pipeline #80117 passed
......@@ -97,7 +97,7 @@ public class Image {
}
public void addTags(ArrayList<Tag> tags) {
tags.addAll(tags);
this.tags.addAll(tags);
}
public void addTag(Tag tag){
......
......@@ -37,8 +37,12 @@ public class Tag {
@ManyToMany(cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
@JoinTable(
name = "image_tag",
joinColumns = {@JoinColumn(name = "tag_id")},
inverseJoinColumns = {@JoinColumn(name = "image_id")}
joinColumns = {@JoinColumn(name = "tags_tagId",
referencedColumnName = "tagId"
)},
inverseJoinColumns = {@JoinColumn(name = "image_id",
referencedColumnName = "id"
)}
)
Set<Image> image = new HashSet<>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment