lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-13 07:29:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

VC/Vidyo: Make PIN validation more user-friendly.

Browse Source
This commit is contained in:
Adrian Moennich 2017-02-15 10:32:48 +01:00
parent f468742492
commit e5a7b0c573
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vc_vidyo/indico_vc_vidyo/forms.py
View File

@ -16,24 +16,20 @@
from __future__ import unicode_literals
import re
from wtforms.fields.core import BooleanField
from wtforms.fields.simple import TextAreaField
from wtforms.validators import DataRequired, Length, Optional, ValidationError
from wtforms.validators import DataRequired, Length, Optional, ValidationError, Regexp
from indico.modules.vc.forms import VCRoomFormBase, VCRoomAttachFormBase
from indico.util.user import retrieve_principal
from indico.web.forms.base import generated_data
from indico.web.forms.fields import PrincipalField, IndicoPasswordField
from indico.web.forms.validators import IndicoRegexp
from indico.web.forms.widgets import SwitchWidget
from indico_vc_vidyo import _
from indico_vc_vidyo.util import iter_user_identities
PIN_RE = re.compile(r'^\d+$')
ERROR_MSG_PIN = _("The PIN must be a number")
PIN_VALIDATORS = [Optional(), Length(min=3, max=10), Regexp(r'^\d+$', message=_("The PIN must be a number"))]
class VidyoAdvancedFormMixin(object):
@ -61,12 +57,11 @@ class VCRoomForm(VCRoomFormBase, VidyoAdvancedFormMixin):
description = TextAreaField(_('Description'), [DataRequired()], description=_('The description of the room'))
owner_user = PrincipalField(_('Owner'), [DataRequired()], description=_('The owner of the room'))
moderation_pin = IndicoPasswordField(_('Moderation PIN'),
[Optional(), Length(min=3, max=10), IndicoRegexp(PIN_RE)],
toggle=True, description=_('Used to moderate the VC Room'))
room_pin = IndicoPasswordField(
_('Room PIN'), [Optional(), Length(min=3, max=10), IndicoRegexp(PIN_RE, message=ERROR_MSG_PIN)],
toggle=True, description=_('Used to protect the access to the VC Room (leave blank for open access)'))
moderation_pin = IndicoPasswordField(_('Moderation PIN'), PIN_VALIDATORS, toggle=True,
description=_('Used to moderate the VC Room. Only digits allowed.'))
room_pin = IndicoPasswordField(_('Room PIN'), PIN_VALIDATORS, toggle=True,
description=_('Used to protect the access to the VC Room (leave blank for open '
'access). Only digits allowed.'))
auto_mute = BooleanField(_('Auto mute'),
widget=SwitchWidget(_('On'), _('Off')),
description=_('The VidyoDesktop clients will join the VC room muted by default '