From eb29fb082686a37a12176ef6f504615e131db28c Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Tue, 5 Mar 2013 20:06:30 +0100 Subject: [PATCH] sms: separate setting and test pages --- wcs/admin/settings.ptl | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/wcs/admin/settings.ptl b/wcs/admin/settings.ptl index a3b754a26..6b5bde5f7 100644 --- a/wcs/admin/settings.ptl +++ b/wcs/admin/settings.ptl @@ -698,7 +698,7 @@ class SettingsDirectory(QommonSettingsDirectory): form = Form(enctype='multipart/form-data') form.add(SingleSelectWidget, 'mode', title = _('SMS Mode'), value = mode, - options = [('none', _('No support'), 'none')]+ + options = [(str('none'), _('No support'), str('none'))]+ [(str(k), _(SMS.providers.get(k)[0]), str(k)) for k in SMS.providers.keys()]) form.add_submit('submit', _('Submit')) @@ -732,14 +732,7 @@ class SettingsDirectory(QommonSettingsDirectory): form.render() if mode != 'none': - form = Form(enctype='multipart/form-data', action='smstest') - form.add(StringWidget, 'sender', title=_('Sender'), required=True) - form.add(StringWidget, 'destinations', title=_('Destinations'), required=True) - form.add(StringWidget, 'text', title=_('Text'), required=True) - form.add_submit('submit', _('Submit')) - - '

%s

' % _('SMS Test') - form.render() + '

%s

' % _('SMS Test') def smstest [html] (self): form = Form(enctype='multipart/form-data', action='smstest') @@ -752,15 +745,13 @@ class SettingsDirectory(QommonSettingsDirectory): if form.get_widget('cancel').parse(): return redirect('sms') - if not form.get_submit(): - return redirect('sms') - + get_response().breadcrumb.append(('sms', _('SMS'))) get_response().breadcrumb.append(('smstest', _('SMS Test'))) html_top('settings', title = _('SMS Test')) '

%s

' % _('SMS Test') form.render() - if not form.has_errors(): + if form.get_submit() and not form.has_errors(): sms_cfg = get_cfg('sms', {}) mode = sms_cfg.get('mode', 'none') sms = SMS.get_sms_class(mode)