Skip to content
Snippets Groups Projects
Commit 20ab823b authored by Nicolay Schiøll-Johansen's avatar Nicolay Schiøll-Johansen
Browse files

Merge branch 'Small-fixes' into 'dev'

added title to view album

See merge request !221
parents 57d85fd5 1376ca7d
No related branches found
No related tags found
2 merge requests!233Final merge to master!,!221added title to view album
Pipeline #83177 passed
......@@ -84,7 +84,7 @@ public class ViewAlbum extends NavBarController implements Initializable {
if (albumImages.size() > 0) {
NTNU.IDATT1002.models.Image mainImage = albumImages.get(0);
mainImageContainer.setImage(ImageUtil.convertToFXImage(mainImage));
mainImageTitle.setText("ADD IMAGE TITLE");
mainImageTitle.setText(mainImage.getTitle());
mainImageTags.setText(TagService.getTagsAsString(mainImage.getTags()));
metadataVBox.setId(String.valueOf(mainImage.getId()));
metadataVBox.setOnMouseClicked(this::openPopUpMetadata);
......@@ -121,7 +121,7 @@ public class ViewAlbum extends NavBarController implements Initializable {
Optional<NTNU.IDATT1002.models.Image> findImage = currentAlbum.getImages().stream().filter(img -> img.getId().equals(clickedImageId)).findFirst();
findImage.ifPresent(newImage -> {
Image image = ImageUtil.convertToFXImage(newImage);
mainImageTitle.setText("ADD IMAGE TITLE");
mainImageTitle.setText(newImage.getTitle());
mainImageTags.setText(TagService.getTagsAsString(newImage.getTags()));
mainImageContainer.setImage(image);
metadataVBox.setId(String.valueOf(newImage.getId()));
......
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