fix some issues with scheduled messages page

ansible/env_vars/base.yml

@@ -1,7 +1,7 @@
 ---
 
 git_repo: https://github.com/monty5811/apostello.git
-git_version: v1.7.0
+git_version: v1.7.1
 
 project_name: apostello
 application_name: apostello

api/serializers.py

@@ -169,6 +169,10 @@ class Meta:
 
 
 class QScheduleSerializer(serializers.ModelSerializer):
+    """Serialize scheduled django-q tasks.
+
+    Note - this will only work with scheduled message tasks.
+    """
 
     next_run = serializers.DateTimeField()
     message_body = serializers.SerializerMethodField()
@@ -182,9 +186,13 @@ def _split_args(sched_args):
         return ast.literal_eval(sched_args)
 
     def get_message_body(self, obj):
+        if obj.args is None:
+            return None
         return self._split_args(obj.args)[1]
 
     def get_recipient(self, obj):
+        if obj.args is None:
+            return None
         pk = self._split_args(obj.args)[0]
         if pk is not None:
             grp = Recipient.objects.get(pk=pk)
@@ -194,6 +202,8 @@ def get_recipient(self, obj):
             return {'url': '#', 'full_name': 'n/a'}
 
     def get_recipient_group(self, obj):
+        if obj.args is None:
+            return None
         grp_name = self._split_args(obj.args)[2]
         if grp_name is not None:
             grp = RecipientGroup.objects.get(name=grp_name)
@@ -203,6 +213,8 @@ def get_recipient_group(self, obj):
             return {'url': '#', 'name': 'n/a'}
 
     def get_queued_by(self, obj):
+        if obj.args is None:
+            return None
         return self._split_args(obj.args)[3]
 
     class Meta:

api/urls.py

@@ -199,7 +199,7 @@
             model_class=Schedule,
             serializer_class=s.QScheduleSerializer,
             filter_list=True,
-            filters={'func__contains': 'send'},
+            filters={'func__contains': 'send_message'},
             permission_classes=(IsAuthenticated, IsStaff)
         ),
         name='q_schedules'

docs/conf.py

@@ -44,7 +44,7 @@
 copyright = '2015, Dean Montgomery'
 author = 'Dean Montgomery'
 
-version = '1.7.0'
+version = '1.7.1'
 # The full version, including alpha/beta/rc tags.
 release = '0.1'
 language = None

scripts/install.sh

@@ -1,5 +1,5 @@
 set -e
-AP_VER=v1.7.0
+AP_VER=v1.7.1
 
 echo "Installing and upgrading packages"
 sudo apt-get update -qq