Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits: 26ab86bf by Bert Leunis at 2016-09-13T11:41:24+02:00 CMS-10433 hide timezone selection always on the console login page - - - - - 2375b84d by Jeroen Hoffman at 2016-10-13T13:33:40+02:00 CMS-10433 Merge master changes into bugfix branch - - - - - b45af2da by Jeroen Hoffman at 2016-10-13T13:40:13+02:00 CMS-10433 Reintegrate bugfix branch into master - - - - - 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 @@ -34,9 +34,11 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.util.template.PackageTextTemplate; import org.apache.wicket.util.template.TextTemplate; +import org.hippoecm.frontend.Main; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; import org.hippoecm.frontend.session.UserSession; +import org.hippoecm.frontend.util.WebApplicationHelper; public class DefaultLoginPlugin extends SimpleLoginPlugin { @@ -80,7 +82,8 @@ public class DefaultLoginPlugin extends SimpleLoginPlugin { super(id, autoComplete, locales, handler); final IPluginConfig config = getPluginConfig(); - final boolean isTimeZoneVisible = config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM); + final boolean consoleLogin = WebApplicationHelper.getApplicationName().equals(Main.PLUGIN_APPLICATION_VALUE_CONSOLE); + final boolean isTimeZoneVisible = !consoleLogin && config.getBoolean(SHOW_TIMEZONES_CONFIG_PARAM); if (isTimeZoneVisible) { availableTimeZones = getSelectableTimezones(config.getStringArray(SELECTABLE_TIMEZONES_CONFIG_PARAM)); View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/711a72881dd9d862324b2a408bea041049f1fd2e...b45af2dab439174ea6bf62b8d45bc391098c9ed4
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn