This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 5f3fc79c850147985828c748dde7bed5ce918d21 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Sun Aug 2 16:28:30 2015 +0200 add support for more than one BowAuthentication for one Bookmark (need when bookmark is shared) --- .../main/java/org/chorem/bow/BowSearchResult.java | 17 +++++++--- .../org/chorem/bow/action/bookmark/HomeAction.java | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 39 +++++++++++----------- 4 files changed, 33 insertions(+), 27 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java index 2ddfe5e..cc77710 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowSearchResult.java @@ -55,7 +55,7 @@ public class BowSearchResult { protected List<BowBookmark> bookmarks; - protected Map<String, BowAuthentication> authMap; + protected Map<String, List<BowAuthentication>> authMap; protected List<FacetTopic> tagsCloud; @@ -81,9 +81,16 @@ public class BowSearchResult { setBookmarks(result.getAll()); - authMap = new HashMap<String, BowAuthentication>(); + authMap = new HashMap<String, List<BowAuthentication>>(); for (BowAuthentication auth : auths) { - authMap.put(auth.getTarget(), auth); + if (auth != null) { + String targetId = auth.getTarget(); + List<BowAuthentication> authList = authMap.get(targetId); + if (authList == null) { + authMap.put(targetId, authList = new ArrayList<BowAuthentication>()); + } + authList.add(auth); + } } List<FacetTopic> topics = result.getTopic(BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS); @@ -149,11 +156,11 @@ public class BowSearchResult { return bookmarks; } - public BowAuthentication getAuthentication(String id) { + public List<BowAuthentication> getAuthentication(String id) { return authMap.get(id); } - public BowAuthentication getAuthentication(BowBookmark bookmark) { + public List<BowAuthentication> getAuthentication(BowBookmark bookmark) { return getAuthentication(bookmark.getWikittyId()); } diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java index 32a6089..7402d60 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/HomeAction.java @@ -109,7 +109,7 @@ public class HomeAction extends BowBaseAction { proxy.findAllByQuery(BowAuthentication.class, criteria); log.debug("******** query was: " + result.getQueryString()); - log.info("******** auths query was: " + auths.getQueryString()); + log.debug("******** auths query was: " + auths.getQueryString()); searchResult = new BowSearchResult(result, auths, tagLine); } diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp index 2188574..db4b961 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp @@ -79,7 +79,7 @@ <s:else> <s:iterator value="searchResult.bookmarks" var="bookmark"> <s:set name="bookmark" value="bookmark"/> - <s:set name="auth" value="searchResult.getAuthentication(#bookmark)"/> + <s:set name="auths" value="searchResult.getAuthentication(#bookmark)"/> <jsp:include page="inc/bookmark.jsp" flush="true"/> </s:iterator> </s:else> diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp index a0dd242..248cc28 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp @@ -56,14 +56,6 @@ </s:a> </s:if> </span> - <s:if test="#auth != null"> - <span class="left"> - <a class="scriptlet" href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> - </span> - <span class="left"> - <a class="script" href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> - </span> - </s:if> <span class="spacemax"></span> <span class="right"> <s:url var="screenshotBookmark" action="screenshotBookmark" escapeAmp="true"> @@ -129,19 +121,26 @@ <div class="markdown"> ${u:toHtml(bookmark.description)} </div> - <s:if test="#auth != null"> - <h3><s:text name="bow.bookmark.authentication" /> :</h3> - <s:if test="!#auth.description.empty"> - <div class="markdown"> - ${u:toHtml(auth.description)} - </div> + <s:iterator value="#auths" var="auth"> + <s:set name="auth" value="auth"/> + <s:if test="#auth != null"> + <h3> + <s:text name="bow.bookmark.authentication" /> : + <a class="scriptlet" href="${u:scriptletPassword(auth)}">BowPwd${bookmark.privateAlias}</a> + <a class="script" href="${u:scriptPassword(auth)}" download="BowPwd${bookmark.privateAlias}.sh">BowPwd${bookmark.privateAlias}.sh</a> + </h3> + <s:if test="!#auth.description.empty"> + <div class="markdown"> + ${u:toHtml(auth.description)} + </div> + </s:if> + <s:if test="!#auth.form.empty"> + <div class="markdown"> + ${u:toHtml(auth.form)} + </div> + </s:if> </s:if> - <s:if test="!#auth.form.empty"> - <div class="markdown"> - ${u:toHtml(auth.form)} - </div> - </s:if> - </s:if> + </s:iterator> <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#bookmark.labels" var="tag"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.