branch develop updated (4c4988f -> 76ef205)
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 4c4988f [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 76ef205 fixes bug in group creation 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 76ef205ba625c3d9b8c28226771cc951b3f7e3cd Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Jul 20 21:04:44 2015 +0200 fixes bug in group creation Summary of changes: .../org/chorem/bow/action/group/GroupEditAction.java | 18 +++++++++++++----- .../org/chorem/bow/action/group/GroupViewAction.java | 4 +++- 2 files changed, 16 insertions(+), 6 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 76ef205ba625c3d9b8c28226771cc951b3f7e3cd Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Jul 20 21:04:44 2015 +0200 fixes bug in group creation --- .../org/chorem/bow/action/group/GroupEditAction.java | 18 +++++++++++++----- .../org/chorem/bow/action/group/GroupViewAction.java | 4 +++- 2 files changed, 16 insertions(+), 6 deletions(-) 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 90edbb4..1edca93 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 @@ -93,9 +93,11 @@ public class GroupEditAction extends BowBaseAction { } public void loadGroup() { - log.fatal("group load " + group); + if (log.isDebugEnabled()) { + log.debug("group load " + group); + } BowProxy proxy = getBowProxy(); - if (groupId == null) { + if (StringUtils.isBlank(groupId)) { BowSession session = getBowSession(); BowUser user = session.getUser(); @@ -106,7 +108,9 @@ public class GroupEditAction extends BowBaseAction { } else { group = proxy.restore(BowGroup.class, groupId, "WikittyGroup.members"); } - log.fatal("group loaded " + group); + if (log.isDebugEnabled()) { + log.debug("group loaded " + group); + } } public String load() throws Exception { @@ -139,7 +143,9 @@ public class GroupEditAction extends BowBaseAction { } public String save() throws Exception { - log.fatal("group save " + group); + if (log.isDebugEnabled()) { + log.debug("group save " + group); + } String result = SUCCESS; try { BowSession session = getBowSession(); @@ -193,7 +199,9 @@ public class GroupEditAction extends BowBaseAction { } public String delete() throws Exception { - log.fatal("group delete " + group); + if (log.isDebugEnabled()) { + log.debug("group delete " + group); + } String result = SUCCESS; try { BowSession session = getBowSession(); diff --git a/bow-ui/src/main/java/org/chorem/bow/action/group/GroupViewAction.java b/bow-ui/src/main/java/org/chorem/bow/action/group/GroupViewAction.java index 5989720..5efbe64 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/group/GroupViewAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/group/GroupViewAction.java @@ -67,7 +67,9 @@ public class GroupViewAction extends BowBaseAction { BowUser user = session.getUser(); BowProxy proxy = session.getProxy(); - WikittyQuery criteria = new WikittyQueryMaker().and().eq(BowGroup.ELEMENT_FIELD_WIKITTYGROUP_MEMBERS, user).end(); + WikittyQuery criteria = new WikittyQueryMaker().and() + .exteq(BowGroup.EXT_BOWGROUP) + .eq(BowGroup.ELEMENT_FIELD_WIKITTYGROUP_MEMBERS, user).end(); WikittyQueryResult<String> groupsId = proxy.findAllByQuery(criteria); groups = proxy.restore(BowGroup.class, groupsId.getAll(), "WikittyGroup.members"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm