From 37e7f783a0d4fc70055d4b4aefbdf6584310c6dc Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 29 Jul 2016 16:00:45 +0200 Subject: [PATCH] get "integer" type settings working, by removing not used size attribute from template causing a 0 size input for integer --- calendar/inc/class.calendar_groupdav.inc.php | 4 ++-- preferences/inc/class.preferences_settings.inc.php | 1 - preferences/templates/default/settings.xet | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index d57e40888d..5d0e1b6609 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -1638,7 +1638,7 @@ class calendar_groupdav extends Api\CalDAV\Handler 'admin' => False, ); $settings['calendar-past-limit'] = array( - 'type' => 'input', + 'type' => 'integer', 'label' => lang('How many days to sync in the past (default %1)', self::PAST_LIMIT), 'name' => 'calendar-past-limit', 'help' => 'Clients not explicitly stating a limit get limited to these many days. A too high limit may cause problems with some clients.', @@ -1646,7 +1646,7 @@ class calendar_groupdav extends Api\CalDAV\Handler 'admin' => False, ); $settings['calendar-future-limit'] = array( - 'type' => 'input', + 'type' => 'integer', 'label' => lang('How many days to sync in the future (default %1)', self::FUTURE_LIMIT), 'name' => 'calendar-future-limit', 'help' => 'Clients not explicitly stating a limit get limited to these many days. A too high limit may cause problems with some clients.', diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php index e3b90453d7..f8b39ba1b2 100644 --- a/preferences/inc/class.preferences_settings.inc.php +++ b/preferences/inc/class.preferences_settings.inc.php @@ -435,7 +435,6 @@ class preferences_settings 'type' => $setting['type'], 'label' => preg_replace('||i', "\n", $setting['label']), 'help' => lang($setting['help']), // is html - //'size' => $setting['size'], // old eT 'default' => !empty($default) ? lang('Default').': '.$default : null, 'onchange' => $setting['onchange'], ); diff --git a/preferences/templates/default/settings.xet b/preferences/templates/default/settings.xet index 424320fc74..3ac765ebf3 100644 --- a/preferences/templates/default/settings.xet +++ b/preferences/templates/default/settings.xet @@ -15,7 +15,7 @@ - +