VC/Vidyo: Move notification_emails to core

Also remove notify_managers option
This commit is contained in:
Adrian Moennich 2015-02-27 18:57:11 +01:00
parent c1ab1f9f46
commit dcc4e08ce2
2 changed files with 2 additions and 6 deletions

View File

@ -42,10 +42,6 @@ from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension
class PluginSettingsForm(VCPluginSettingsFormBase):
support_email = EmailField(_('Vidyo email support'))
notification_emails = EmailListField(
_('Notification emails'),
description=_('Additional email addresses who will always receive notifications (one per line)')
)
username = StringField(_('Username'), [DataRequired()], description=_('Indico username for Vidyo'))
password = IndicoPasswordField(_('Password'), [DataRequired()], toggle=True,
description=_('Indico password for Vidyo'))
@ -89,7 +85,6 @@ class VidyoPlugin(VCPluginMixin, IndicoPlugin):
return {
'managers': [],
'acl': [],
'notify_managers': True,
'support_email': Config.getInstance().getSupportEmail(),
'notification_emails': [],
'username': 'indico',

View File

@ -78,7 +78,6 @@ class VidyoImporter(Importer):
'userAPIURL': 'user_api_wsdl',
'prefix': 'indico_room_prefix',
'indicoGroup': 'room_group_name',
'sendMailNotifications': 'notify_managers',
'phoneNumbers': 'vidyo_phone_link',
'maxDaysBeforeClean': 'num_days_old',
'indicoUsername': 'username',
@ -96,6 +95,8 @@ class VidyoImporter(Importer):
if match is None:
continue
value = match.group(0)
elif old == 'additionalEmails':
value = list(set(value) | {x.getEmail() for x in option_value(opts['admins'])})
VidyoPlugin.settings.set(new, value)
db.session.commit()