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 e7b32138e4e839669169ec5aee90377932a2335b Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Fri Jul 17 21:46:08 2015 +0200 fixes #1262: add support to track bookmark add throw atom feed - fixes bug in atom format --- .../java/org/chorem/bow/action/AtomAction.java | 7 +++-- bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 32 +++++++++++----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java b/bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java index c262307..7c6803c 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java @@ -20,6 +20,7 @@ */ package org.chorem.bow.action; +import java.util.Date; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -58,7 +59,7 @@ public class AtomAction extends BowBaseAction { protected List<BowBookmark> bookmarks; - protected String date; + protected Date date; protected String redirectTo = "/"; @@ -78,7 +79,7 @@ public class AtomAction extends BowBaseAction { return bookmarks; } - public String getDate() { + public Date getDate() { return date; } @@ -100,7 +101,7 @@ public class AtomAction extends BowBaseAction { criteria.setLimit(count); WikittyQueryResult<String> bookmarksId = proxy.findAllByQuery(criteria); bookmarks = proxy.restore(BowBookmark.class, bookmarksId.getAll(), "WikittyAuthorisation.owner"); - date = DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.format(System.currentTimeMillis()); + date = new Date(); if (log.isDebugEnabled()) { log.debug(String.format("Rss found='%s'" + bookmarks.size())); diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp index ccc8f97..ab3a756 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp @@ -31,12 +31,12 @@ <title>Bow</title> <subtitle>tag='${tagLine}' search='${fullTextLine}'</subtitle> - <s:url var="bowUrl" action="home" escapeAmp="false"> + <s:url var="bowUrl" action="home" escapeAmp="true"> <s:param name="token" value="%{bowSession.permanentToken}" /> <s:param name="tagLine" value="%{tagLine}" /> <s:param name="fullTextLine" value="%{fullTextLine}" /> </s:url> - <s:url var="atomUrl" action="atom" escapeAmp="false"> + <s:url var="atomUrl" action="atom" escapeAmp="true"> <s:param name="token" value="%{bowSession.permanentToken}" /> <s:param name="tagLine" value="%{tagLine}" /> <s:param name="fullTextLine" value="%{fullTextLine}" /> @@ -45,7 +45,7 @@ <link rel="alternate" type="text/html" href="${bowDomain}${bowUrl}"/> <link rel="self" type="application/atom+xml" href="${bowDomain}${atomUrl}"/> - <updated>${date}</updated> + <updated><fmt:formatDate value="${date}" pattern="yyyy-MM-dd'T'HH:mm:ssXXX" /></updated> <author> <name>${bowSession.user.login}</name> </author> @@ -57,38 +57,38 @@ <s:set name="bookmark" value="bookmark"/> <entry> <title><s:property value="%{#bookmark.link}" /></title> - <s:url var="bookmarkUrl" action="home" escapeAmp="false"> + <s:url var="bookmarkUrl" action="home" escapeAmp="true"> <s:param name="token" value="%{bowSession.permanentToken}" /> <s:param name="fullTextLine" value="%{#bookmark.link}" /> </s:url> <link rel="alternate" type="text/html" href="${bowDomain}${bookmarkUrl}"/> <link href="${bookmark.link}"/> <id>${bowDomain}${bookmark.wikittyId}</id> - <updated><fmt:formatDate value="${bookmark.creationDate}" pattern="yyyy-MM-dd'T'HH:mm:ssZ" /></updated> + <updated><fmt:formatDate value="${bookmark.creationDate}" pattern="yyyy-MM-dd'T'HH:mm:ssXXX" /></updated> <author> <name><s:property value="%{#bookmark.getOwner(false).login}" /></name> </author> <content type="xhtml"> <div xmlns="http://www.w3.org/1999/xhtml"> - <span class="left"> + <span> <s:set var="favicon" value="#bookmark.favicon"/> <c:if test="${fn:length(favicon) > 0}"> - <img class="favicon" src="data:image/png;base64,${u:base64(favicon)}"/> + <img src="data:image/png;base64,${u:base64(favicon)}"/> </c:if> - <span class="left date"><fmt:formatDate value="${bookmark.creationDate}" pattern="yyyy-MM-dd" /></updated></span> + <span><fmt:formatDate value="${bookmark.creationDate}" pattern="yyyy-MM-dd" /></span> <c:if test="${not empty bookmark.privateAlias}"> - <span class="left"> - <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.wikittyId}.action" + <span> + <s:a href="%{config.aliasUrl + #bookmark.wikittyId}.action" title="%{#bookmark.link}" target="_blank"> alias: ${bookmark.privateAlias} </s:a> </span> </c:if> <c:if test="${not empty bookmark.publicAlias}"> - <span class="left"> - <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.publicAlias}.action" + <span> + <s:a href="%{config.aliasUrl + #bookmark.publicAlias}.action" title="%{#bookmark.link}" target="_blank"> alias public: ${bookmark.publicAlias} </s:a> @@ -96,7 +96,7 @@ </c:if> </span> - <div class="description"> + <div> <p> <s:a href="%{config.aliasUrl + #bookmark.wikittyId}.action">${bookmark.link}</s:a> </p> @@ -104,17 +104,17 @@ <p> ${bookmark.description} </p> - <p class="tags"> + <p> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#bookmark.labels" var="tag"> - <s:url var="search" action="home" escapeAmp="false"> + <s:url var="search" action="home" escapeAmp="true"> <s:param name="addTag" value="%{#tag}"/> <s:param name="tagLine" value="%{tagLine}"/> <s:param name="fullTextLine" value="%{fullTextLine}"/> <s:param name="order" value="%{order}"/> <%-- on ne met pas 'first', il faut repartir de 0 --%> </s:url> - <a href="${bowDomain}${search}" cssClass="tag"><s:property value="%{#tag}"/></a> + <a href="${bowDomain}${search}"><s:property value="%{#tag}"/></a> </s:iterator> </p> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.