Merge branch 'v1.9.8'

This commit is contained in:
Adrian Moennich 2016-10-06 18:47:30 +02:00
commit 3b3559c12f

View File

@ -20,12 +20,13 @@ import re
from wtforms.fields.core import BooleanField
from wtforms.fields.simple import TextAreaField
from wtforms.validators import DataRequired, Length, Regexp, Optional, ValidationError
from wtforms.validators import DataRequired, Length, Optional, ValidationError
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 _
@ -61,10 +62,10 @@ 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), Regexp(PIN_RE)],
[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), Regexp(PIN_RE, message=ERROR_MSG_PIN)],
_('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)'))
auto_mute = BooleanField(_('Auto mute'),
widget=SwitchWidget(_('On'), _('Off')),