[HippoCMS-scm] [Git][cms-community/hippo-cms][master] 3 commits: CMS-6954: Not allowing empty selection in the timezones dropdown

[Arthur Bogaart]

Arthur Bogaart pushed to branch master 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

- - - - -
5c519485 by mchatzidakis at 2016-07-15T16:55:15+02:00
CMS-6954: Changed setting name to 'selectable-timezones'

- - - - -
ed94fde0 by Arthur Bogaart at 2016-07-18T12:03:46+02:00
CMS-6954 Reintegrate bugfix/CMS-6954

- - - - -


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();
                 }
@@ -90,7 +90,7 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin {
                 final DropDownChoice<String> 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/compare/c49682116a9651ca0acef2de08a629b007873e7b...ed94fde0018afb78cee8404026a8d77ae47c0bb5

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn