Bugfixes for alerts

gracedb/alerts/main.py

@@ -113,7 +113,7 @@ def issue_alerts(event_or_superevent, alert_type, url=None, file_name="",
     # Send XMPP alert
     if settings.SEND_XMPP_ALERTS:
         issue_xmpp_alert(event_or_superevent, alert_type, file_name,
-            serialized_object=serialized_object)
+            description=description, serialized_object=serialized_object)
 
     # Below here, we only do processing for email and phone alerts ------------
 

gracedb/superevents/api/serializers.py

@@ -222,7 +222,7 @@ class SupereventLabelSerializer(serializers.ModelSerializer):
         creator = validated_data.pop('submitter')
         superevent = validated_data.pop('superevent')
         label = validated_data.pop('label')
-        labelling = add_label_to_superevent(superevent, label, creator,
+        labelling , _ = add_label_to_superevent(superevent, label, creator,
             add_log_message=True, issue_alert=True)
         return labelling
 

gracedb/superevents/utils.py

@@ -314,7 +314,7 @@ def remove_event_from_superevent(superevent, event, user, add_event_log=True,
     event_log_for_removal_from_superevent = None
     if add_event_log:
         event_comment ='Removed from superevent: {superevent_id}'.format(
-            superevent_id=superevent.superevent_id),
+            superevent_id=superevent.superevent_id)
         event_log_for_removal_from_superevent = create_log(user, event_comment,
             event, issue_alert=issue_event_alert, autogenerated=True)