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 6303a701fe5f89253caccdb470f04c2a1acbbf16 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Mon Jul 20 12:57:51 2015 +0200 add configuration to allow or not public group --- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 22 ++++++++++++++++++++++ .../main/java/org/chorem/bow/BowConfigOption.java | 4 ++++ .../chorem/bow/action/group/GroupEditAction.java | 5 +---- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 6 ++++-- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/bow-ui/src/main/java/org/chorem/bow/BowConfig.java b/bow-ui/src/main/java/org/chorem/bow/BowConfig.java index 555ee5f..b478689 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowConfig.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowConfig.java @@ -144,6 +144,28 @@ public class BowConfig { } /** + * return true if public group is allowed + * Default bow applicationConfig will be used + * + * @return true if public group is allowed + * @since 1.5 + */ + public static boolean isAllowPublicGroup() { + return isAllowPublicGroup(getConfig()); + } + + /** + * return true if public group is allowed + * + * @param config bow configuration + * @return true if public group is allowed + * @since 1.5 + */ + public static boolean isAllowPublicGroup(ApplicationConfig config) { + return config.getOptionAsBoolean(BowConfigOption.BOW_ALLOW_PUBLIC_GROUP.key); + } + + /** * Get bow screenshot url server as string. * Default bow applicationConfig will be used * diff --git a/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java b/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java index 6084cce..f87f6d9 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java @@ -45,6 +45,10 @@ public enum BowConfigOption implements ConfigOptionDef { "alias.url", t("bow.config.alias.url.description"), "alias/", String.class, false, false), + BOW_ALLOW_PUBLIC_GROUP( + "allow.public.group", + t("bow.config.bow.allow.public.group.description"), + "false", Boolean.class, false, false), BOW_SCREENSHOT_URL( "bow.screenshot.url", t("bow.config.bow.screenshot.url.description"), 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 09e0390..90edbb4 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 @@ -22,9 +22,7 @@ package org.chorem.bow.action.group; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -34,7 +32,6 @@ import org.chorem.bow.BowGroupImpl; import org.chorem.bow.BowProxy; import org.chorem.bow.BowSession; import org.chorem.bow.BowUser; -import org.chorem.bow.BowUserHelper; import org.chorem.bow.BowUtils; import org.chorem.bow.action.BowBaseAction; import org.nuiton.wikitty.entities.Wikitty; @@ -87,7 +84,7 @@ public class GroupEditAction extends BowBaseAction { public void setPublic(boolean pub) { String reader; - if (pub) { + if (pub && getConfig().isAllowPublicGroup()) { reader = WikittyServiceAuthorisation.PUBLIC; } else { reader = getGroup().getWikittyId(); diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp index 92a0927..c86e841 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp @@ -92,8 +92,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:hidden name="groupId" value="%{groupId}"/> - <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" - value="%{public}" /> + <s:if test="config.allowPublicGroup"> + <s:checkbox labelposition="left" name="public" labelSeparator=" " key="bow.groupEdit.public" + value="%{public}" /> + </s:if> <s:textfield disabled="%{groupId != null}" name="group.name" labelSeparator=" " key="bow.groupEdit.name" value="%{group.name}" /> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.