branch develop updated (b36a9f5 -> c43a0f5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from b36a9f5 add link to shared user to go home page new c43a0f5 fixes #1270: the user must configure the atom stream to not receive its own links The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c43a0f51e432a0e4515287d7ea66b6092be91ef7 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 23:44:11 2015 +0200 fixes #1270: the user must configure the atom stream to not receive its own links Summary of changes: bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 6 +++++- bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java | 13 ++++++++++++- .../bow/action/bookmark/DeleteSearchResultsAction.java | 2 +- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 1 + 5 files changed, 20 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 c43a0f51e432a0e4515287d7ea66b6092be91ef7 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 23:44:11 2015 +0200 fixes #1270: the user must configure the atom stream to not receive its own links --- bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java | 6 +++++- bow-ui/src/main/java/org/chorem/bow/action/AtomAction.java | 13 ++++++++++++- .../bow/action/bookmark/DeleteSearchResultsAction.java | 2 +- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 1 + 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java index 9444ee9..2159893 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java @@ -112,12 +112,16 @@ public class BookmarkUtils { public static WikittyQuery getBookmarkListCriteriaByUser(BowUser user, List<String> listId, String tagLine, String fullTextLine, - String order, int first) { + boolean notmine, String order, int first) { WikittyQueryMaker search = new WikittyQueryMaker().and(); search.exteq(BowBookmark.EXT_BOWBOOKMARK); addEqUser(search, user.getWikittyId()); + if (notmine) { + search.ne(BowBookmark.FQ_FIELD_WIKITTYAUTHORISATION_OWNER, user.getWikittyId()); + } + if (CollectionUtils.isNotEmpty(listId)) { search.containsOne(Element.ID, listId); } 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 b4efed0..f9408ce 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 @@ -53,6 +53,9 @@ public class AtomAction extends BowBaseAction { protected int count = 15; + /** if true bookmark of logged user is not send */ + protected boolean notmine; + protected List<BowBookmark> bookmarks; protected Date date; @@ -71,6 +74,14 @@ public class AtomAction extends BowBaseAction { this.count = count; } + public boolean isNotmine() { + return notmine; + } + + public void setNotmine(boolean notmine) { + this.notmine = notmine; + } + public List<BowBookmark> getBookmarks() { return bookmarks; } @@ -93,7 +104,7 @@ public class AtomAction extends BowBaseAction { BowProxy proxy = session.getProxy(); WikittyQuery criteria = BookmarkUtils.getBookmarkListCriteriaByUser( - user, listId, tagLine, fullTextLine, "descDate", 0); + user, listId, tagLine, fullTextLine, notmine, "descDate", 0); criteria.setLimit(count); WikittyQueryResult<String> bookmarksId = proxy.findAllByQuery(criteria); bookmarks = proxy.restore(BowBookmark.class, bookmarksId.getAll(), "WikittyAuthorisation.owner"); diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java index fd7f466..13b9b0c 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/DeleteSearchResultsAction.java @@ -53,7 +53,7 @@ public class DeleteSearchResultsAction extends BowBaseAction { // dans ce cas, ne faudrait-il pas seulement ce supprimer des // reader/write/admin ? WikittyQuery criteria = BookmarkUtils.getBookmarkListCriteriaByUser( - user, listId, tagLine, fullTextLine, null, 0); + user, listId, tagLine, fullTextLine, false, null, 0); criteria.setLimit(Integer.MAX_VALUE); BowProxy proxy = getBowProxy(); 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 0303227..d1ed600 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 @@ -94,7 +94,7 @@ public class HomeAction extends BowBaseAction { BowProxy proxy = session.getProxy(); WikittyQuery criteria = BookmarkUtils.getBookmarkListCriteriaByUser( - user, listId, tagLine, fullTextLine, order, first); + user, listId, tagLine, fullTextLine, false, order, first); WikittyQueryResult<BowBookmark> result = proxy.findAllByQuery(BowBookmark.class, criteria); diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp index 288fb98..f5a0b72 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp @@ -65,6 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:url var="atom" action="atom" escapeAmp="true"> <s:param name="token" value="%{bowSession.permanentToken}" /> <s:param name="tagLine" value="%{'@' + #group.name}" /> + <s:param name="notmine" value="true" /> </s:url> <a class="atom" href="${atom}">atom</a> </span> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm