Fixed a typo in groups.py, forgotten campaign attributes in models.py and an error when getting a campaign with empty timeline.

martindube · martindube · commit a492712f17c0 · 2017-02-02T16:05:00.000-05:00
diff --git a/gophish/api/groups.py b/gophish/api/groups.py
@@ -19,4 +19,4 @@ def put(self, group):
 
     def delete(self, group_id):
         """ Deletes a group by ID """
-        return super(API, self).put(group_id)
+        return super(API, self).delete(group_id)
diff --git a/gophish/models.py b/gophish/models.py
@@ -42,7 +42,7 @@ class Campaign(Model):
         'id': None, 'name': None, 'created_date': datetime.now(tzlocal()),
         'launch_date': datetime.now(tzlocal()), 'completed_date': None, 'template': None,
         'page': None, 'results': [], 'status': None, 'timeline': [],
-        'smtp': None, 'url': None}
+        'smtp': None, 'url': None, 'groups': [], 'profile': None}
 
     def __init__(self, **kwargs):
         """ Creates a new campaign instance """
@@ -58,8 +58,9 @@ def parse(cls, json):
                 results = [Result.parse(result) for result in val]
                 setattr(campaign, key, results)
             elif key == 'timeline':
-                timeline = [TimelineEntry.parse(entry) for entry in val]
-                setattr(campaign, key, timeline)
+                if val is not None:
+                    timeline = [TimelineEntry.parse(entry) for entry in val]
+                    setattr(campaign, key, timeline)
             elif key == 'template':
                 setattr(campaign, key, Template.parse(val))
             elif key == 'page':
