[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch feature/HSTTWO-4177
Minos Chatzidakis pushed new branch feature/HSTTWO-4177 at cms-community / hippo-site-toolkit --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-site-toolkit/tree/feature/HSTTWO-4177 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1570
Minos Chatzidakis pushed new branch feature/CHANNELMGR-1570 at cms-community / hippo-addon-channel-manager --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1570 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-6954] CMS-6954: Handle cases of misconfiguration
Minos Chatzidakis pushed to branch bugfix/CMS-6954 at cms-community / hippo-cms
Commits:
e321f969 by mchatzidakis at 2016-07-18T15:57:05+02:00
CMS-6954: Handle cases of misconfiguration
- - - - -
1 changed file:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
@@ -15,11 +15,14 @@
*/
package org.hippoecm.frontend.plugins.login;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.TimeZone;
+import java.util.stream.Collectors;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
@@ -41,7 +44,7 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
private static final ResourceReference JSTZ_JS = new
JavaScriptResourceReference(DefaultLoginPlugin.class, "jstz.min.js");
public static final String SHOW_TIMEZONES_CONFIG_PARAM = "show.timezones";
-public static final String SELECTABLE_TIMEZONES_CONFIG_PARAM =
"selectable-timezones";
+public static final String SELECTABLE_TIMEZONES_CONFIG_PARAM =
"selectable.timezones";
public DefaultLoginPlugin(final IPluginContext context, final
IPluginConfig config) {
super(context, config);
@@ -74,11 +77,7 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
super(id, autoComplete, locales, handler);
if (getPluginConfig().getBoolean(SHOW_TIMEZONES_CONFIG_PARAM)) {
-String[] timeZones =
getPluginConfig().getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM);
-if (ArrayUtils.isEmpty(timeZones)) {
-timeZones = TimeZone.getAvailableIDs();
-}
-availableTimeZones = Arrays.asList(timeZones);
+availableTimeZones =
getSelectableTimezones(getPluginConfig().getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM));
// Check if user has previously selected a timezone
final String cookieTimeZone = getCookieValue(TIMEZONE_COOKIE);
@@ -112,4 +111,17 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
super.loginSuccess();
}
}
+
+protected List getSelectableTimezones(String[]
configuredSelectableTimezones) {
+List allJavaTimezones =
Arrays.asList(TimeZone.getAvailableIDs());
+List selectableTimezones = new ArrayList<>();
+
+if (configuredSelectableTimezones != null) {
+selectableTimezones =
Arrays.asList(configuredSelectableTimezones).stream()
+.filter(StringUtils::isNotBlank)
+.filter(allJavaTimezones::contains)
+.collect(Collectors.toList());
+}
+return selectableTimezones.isEmpty() ? allJavaTimezones :
selectableTimezones;
+}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/e321f9694d777df45a126c263a80f68b42f2cf2b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-6954] CMS-6954: Changed setting name to 'selectable-timezones'
Minos Chatzidakis pushed to branch bugfix/CMS-6954 at cms-community / hippo-cms
Commits:
5c519485 by mchatzidakis at 2016-07-15T16:55:15+02:00
CMS-6954: Changed setting name to 'selectable-timezones'
- - - - -
1 changed file:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
@@ -41,7 +41,7 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
private static final ResourceReference JSTZ_JS = new
JavaScriptResourceReference(DefaultLoginPlugin.class, "jstz.min.js");
public static final String SHOW_TIMEZONES_CONFIG_PARAM = "show.timezones";
-public static final String SELECTED_TIMEZONES_CONFIG_PARAM =
"selected-timezones";
+public static final String SELECTABLE_TIMEZONES_CONFIG_PARAM =
"selectable-timezones";
public DefaultLoginPlugin(final IPluginContext context, final
IPluginConfig config) {
super(context, config);
@@ -74,7 +74,7 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
super(id, autoComplete, locales, handler);
if (getPluginConfig().getBoolean(SHOW_TIMEZONES_CONFIG_PARAM)) {
-String[] timeZones =
getPluginConfig().getStringArray(SELECTED_TIMEZONES_CONFIG_PARAM);
+String[] timeZones =
getPluginConfig().getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM);
if (ArrayUtils.isEmpty(timeZones)) {
timeZones = TimeZone.getAvailableIDs();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/5c5194856047ffe7d45702f9600ea8b203794599
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-6954] CMS-6954: Not allowing empty selection in the timezones dropdown
Minos Chatzidakis pushed to branch bugfix/CMS-6954 at cms-community / hippo-cms
Commits:
be72de67 by mchatzidakis at 2016-07-15T16:46:14+02:00
CMS-6954: Not allowing empty selection in the timezones dropdown
- - - - -
1 changed file:
-
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
Changes:
=
engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
=
---
a/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
+++
b/engine/src/main/java/org/hippoecm/frontend/plugins/login/DefaultLoginPlugin.java
@@ -90,7 +90,7 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
final DropDownChoice timeZone = new
DropDownChoice<>("timezone",
PropertyModel.of(this, "selectedTimeZone"),
availableTimeZones);
-timeZone.setNullValid(true);
+timeZone.setNullValid(false);
form.add(new Label("timezone-label", new
ResourceModel("timezone-label", "Time zone:")));
form.add(timeZone);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/be72de6707b435604cad8852ed899136f13a7acb
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-6954
Minos Chatzidakis pushed new branch feature/CMS-6954 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
