branch develop updated (d5a2dc7 -> b0b91ff)
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 d5a2dc7 fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups new b0b91ff fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups can't use group if not members (when try to add tag) 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 b0b91ffc6eabf75fda7e19be9663d0f8d6d5b787 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Jul 20 04:31:23 2015 +0200 fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups can't use group if not members (when try to add tag) Summary of changes: .../main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java | 4 ++++ bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties | 4 ++-- bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties | 4 ++-- 3 files changed, 8 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 b0b91ffc6eabf75fda7e19be9663d0f8d6d5b787 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Jul 20 04:31:23 2015 +0200 fixes #229: Partage de bookmark entre utilisateur fixes #1263: Add support for group (private/public) and with specific tag share some bookmark with this groups can't use group if not members (when try to add tag) --- .../main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java | 4 ++++ bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties | 4 ++-- bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java index 74ac2b7..25a5177 100644 --- a/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java +++ b/bow-ui/src/main/java/org/chorem/bow/action/bookmark/AddOrUpdateAction.java @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.bow.BookmarkUtils; import org.chorem.bow.BowBookmark; import org.chorem.bow.BowBookmarkImpl; +import org.chorem.bow.BowConfig; import org.chorem.bow.BowGroup; import org.chorem.bow.BowProxy; import org.chorem.bow.BowUser; @@ -251,6 +252,9 @@ public class AddOrUpdateAction extends BowBaseAction { for (BowGroup g : groups) { groupsName.remove(g.getName()); } + for (String groupName : groupsName) { + bookmark.removeLabels(BowConfig.GROUP_MARK + groupName); + } addActionMessage(t("bow.group.not.members", StringUtils.join(groupsName, ", "))); } diff --git a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties index 1608e5b..8b3f895 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties @@ -60,8 +60,8 @@ bow.group.delete.no.member=No more members, delete group bow.group.members=Members bow.group.name.blank=Group's name empty bow.group.new=Create new group -bow.group.not.members=You are not groups members: %s -bow.group.some.user.not.found=Some users not found: %s +bow.group.not.members=You are not groups members\: %s +bow.group.some.user.not.found=Some users not found\: %s bow.groupEdit.delete=delete bow.groupEdit.members=Members bow.groupEdit.name=Name diff --git a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties index d81fdb4..f10f38d 100644 --- a/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties +++ b/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties @@ -60,8 +60,8 @@ bow.group.delete.no.member=Plus de membre, suppression du groupe bow.group.members=Membres bow.group.name.blank=Nom du groupe vide bow.group.new=Créer un nouveau groupe -bow.group.not.members=Vous n'êtes pas membres des groupes: %s -bow.group.some.user.not.found=Certain utilisateurs n'ont pas été trouvé: %s +bow.group.not.members=Vous n'êtes pas membres des groupes\: %s +bow.group.some.user.not.found=Certain utilisateurs n'ont pas été trouvé\: %s bow.groupEdit.delete=Supprimer bow.groupEdit.members=Membres bow.groupEdit.name=Nom -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm