From dcc4e08ce2942424226cedb945dcdb5ff35be426 Mon Sep 17 00:00:00 2001
From: Adrian Moennich <adrian.moennich@cern.ch>
Date: Fri, 27 Feb 2015 18:57:11 +0100
Subject: [PATCH] VC/Vidyo: Move notification_emails to core

Also remove notify_managers option
---
 vc_vidyo/indico_vc_vidyo/plugin.py     | 5 -----
 vc_vidyo/indico_vc_vidyo/zodbimport.py | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py
index 4f7a62e..a86381c 100644
--- a/vc_vidyo/indico_vc_vidyo/plugin.py
+++ b/vc_vidyo/indico_vc_vidyo/plugin.py
@@ -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',
diff --git a/vc_vidyo/indico_vc_vidyo/zodbimport.py b/vc_vidyo/indico_vc_vidyo/zodbimport.py
index 64b3c12..1e6244d 100644
--- a/vc_vidyo/indico_vc_vidyo/zodbimport.py
+++ b/vc_vidyo/indico_vc_vidyo/zodbimport.py
@@ -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()