From 4ec4224e491341a3f26f4441abc9e3c28070ca58 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sat, 5 Jul 2025 15:05:09 +0200 Subject: Bookmark: Add UI to edit the 'via' field. Change-Id: I2803622d248e0d59a7178382126ad573441c02f9 --- .../mulkcms2/benki/bookmarks/BookmarkResource.java | 4 ++++ .../bookmarks/MlkBookmarkSubmissionForm.js | 22 +++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkResource.java b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkResource.java index 40f7166..d35a1dc 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkResource.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/bookmarks/BookmarkResource.java @@ -62,6 +62,7 @@ public class BookmarkResource extends PostResource { @FormParam("uri") @NotNull URI uri, @FormParam("title") @NotEmpty String title, @FormParam("description") @CheckForNull String description, + @FormParam("via") @CheckForNull String via, @FormParam("visibility") @NotNull Post.Visibility visibility) throws URISyntaxException { @@ -69,6 +70,7 @@ public class BookmarkResource extends PostResource { var bookmark = new Bookmark(); bookmark.uri = uri.toString(); + bookmark.via = (via != null && !via.trim().isEmpty()) ? via : null; bookmark.tags = Set.of(); bookmark.owner = user; bookmark.date = OffsetDateTime.now(); @@ -94,6 +96,7 @@ public class BookmarkResource extends PostResource { @FormParam("uri") @NotNull URI uri, @FormParam("title") @NotEmpty String title, @FormParam("description") @CheckForNull String description, + @FormParam("via") @CheckForNull String via, @FormParam("visibility") Post.Visibility visibility) throws URISyntaxException { @@ -110,6 +113,7 @@ public class BookmarkResource extends PostResource { } bookmark.uri = uri.toString(); + bookmark.via = (via != null && !via.trim().isEmpty()) ? via : null; bookmark.tags = Set.of(); bookmark.setTitle(title); bookmark.setDescription(description); diff --git a/src/main/resources/META-INF/resources/bookmarks/MlkBookmarkSubmissionForm.js b/src/main/resources/META-INF/resources/bookmarks/MlkBookmarkSubmissionForm.js index 83242ba..2a2c779 100644 --- a/src/main/resources/META-INF/resources/bookmarks/MlkBookmarkSubmissionForm.js +++ b/src/main/resources/META-INF/resources/bookmarks/MlkBookmarkSubmissionForm.js @@ -21,6 +21,9 @@ template.innerHTML = ` + + +