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 ab9fc2ae635a12472129fa17ed5763e4c42e7aa8 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 30 19:47:42 2015 +0200 add some FIXME and debug --- .../java/org/chorem/bow/action/bookmark/HomeAction.java | 1 + .../java/org/chorem/bow/action/group/GroupEditAction.java | 6 ++++++ .../chorem/bow/action/sharedUser/SharedUserEditAction.java | 13 ++++--------- 3 files changed, 11 insertions(+), 9 deletions(-) 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 7161053..0303227 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 @@ -98,6 +98,7 @@ public class HomeAction extends BowBaseAction { WikittyQueryResult<BowBookmark> result = proxy.findAllByQuery(BowBookmark.class, criteria); + log.debug("******** query was: " + result.getQueryString()); searchResult = new BowSearchResult(result, tagLine); } diff --git a/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java index 1edca93..acf8e01 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/group/GroupEditAction.java @@ -178,6 +178,8 @@ public class GroupEditAction extends BowBaseAction { } if (result == SUCCESS && CollectionUtils.isEmpty(getGroup().getMembers())) { addActionMessage(t("bow.group.delete.no.member")); + // FIXME poussin 20150730 convert all tag '@<group>' to '<group>' + // when group is destroy proxy.delete(group); } else { // force admin to group all time @@ -206,6 +208,10 @@ public class GroupEditAction extends BowBaseAction { try { BowSession session = getBowSession(); BowProxy proxy = session.getProxy(); + + // FIXME poussin 20150730 convert all tag '@<group>' to '<group>' + // when group is destroy + proxy.delete(group); } catch (Exception eee) { diff --git a/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java b/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java index 5631b92..df2e381 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/sharedUser/SharedUserEditAction.java @@ -20,10 +20,6 @@ */ package org.chorem.bow.action.sharedUser; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,11 +30,6 @@ import org.chorem.bow.BowSession; import org.chorem.bow.BowUser; import org.chorem.bow.BowUtils; import org.chorem.bow.action.BowBaseAction; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyUserHelper; -import org.nuiton.wikitty.query.WikittyQuery; -import org.nuiton.wikitty.query.WikittyQueryMaker; -import org.nuiton.wikitty.query.WikittyQueryResult; /** * Handles RSS flux demande @@ -135,6 +126,10 @@ public class SharedUserEditAction extends BowBaseAction { try { BowSession session = getBowSession(); BowProxy proxy = session.getProxy(); + + // FIXME poussin 20150730 convert all tag '#<user>' to '<user>' + // when user is destroy + proxy.delete(sharedUserId); } catch (Exception eee) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.