Merge branch 'feature/admin-in-notif' into 'develop'

Fix Issue #9

Add admin info in email notifications

See merge request !8

helios/models.py

@@ -615,11 +615,13 @@ def notify_admins(self, msg='', subject='', send_anyway=False):
         if send_anyway or (not self.trial):
             election_type = self.get_module().module_id
             trustees = self.trustees.all()
+            admins = self.admins.all()
             context = {
                 'election': self,
                 'msg': msg,
                 'election_type': election_type,
                 'trustees': trustees,
+                'admins': admins,
                 'subject': subject,
             }
 

helios/templates/email/admin_mail.txt

@@ -15,3 +15,7 @@
    * {{trustee.name}} {{trustee.email}}
 {% endfor %}
 
+- Election Admins
+{% for admin in admins %}
+   * {{admin.id}}  {{admin.user_id}} {{admin.institution.name}}
+{% endfor %}

zeus/forms.py

@@ -208,13 +208,6 @@ def save(self, *args, **kwargs):
         saved.save()
         if saved.feature_edit_trustees:
             saved.update_trustees(trustees)
-
-        if self.creating:
-            saved.logger.info("Election created")
-            msg = "New election created"
-            subject = "New Zeus election"
-            saved.notify_admins(msg=msg, subject=subject)
-
         else:
             saved.logger.info("Election updated %r", self.changed_data)
             self.log_changed_fields(saved)

zeus/views/election.py

@@ -49,6 +49,11 @@ def add_or_update(request, election=None):
             election = election_form.save()
             if not election.admins.filter(pk=user.pk).count():
                 election.admins.add(user)
+            if election_form.creating:
+                election.logger.info("Election created")
+                msg = "New election created"
+                subject = "New Zeus election"
+                election.notify_admins(msg=msg, subject=subject)
             # TODO, make this optional ?
             if not election.has_helios_trustee():
                 election.generate_trustee()