Merge pull request #41 from praekelt/feature/issue-41-fix-boolean-ope…

…rator-bugs

Fix boolean operator bugs

molo/surveys/migrations/0018_add_combination_rule.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2017-11-07 07:01
+# Generated by Django 1.9.13 on 2017-11-07 09:55
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -13,7 +13,6 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('wagtail_personalisation', '0013_auto_20171026_1748'),
         ('surveys', '0017_make_count_positive_integer'),
     ]
 
@@ -29,9 +28,4 @@ class Migration(migrations.Migration):
                 'verbose_name': 'Rule Combination',
             },
         ),
-        migrations.AlterField(
-            model_name='articletagrule',
-            name='date_to',
-            field=models.DateTimeField(blank=True, help_text='All times are UTC. Leave both fields blank to search all time.', null=True),
-        ),
     ]

molo/surveys/rules.py

@@ -394,31 +394,36 @@ def description(self):
 
     def clean(self):
         super(CombinationRule, self).clean()
-        if isinstance(self.body.stream_data[0], dict):
-            newData = [block['type'] for block in self.body.stream_data]
-        elif isinstance(self.body.stream_data[0], tuple):
-            newData = [block[0] for block in self.body.stream_data]
+        if len(self.body.stream_data) > 0:
+            if isinstance(self.body.stream_data[0], dict):
+                newData = [block['type'] for block in self.body.stream_data]
+            elif isinstance(self.body.stream_data[0], tuple):
+                newData = [block[0] for block in self.body.stream_data]
 
-        if (len(newData) - 1) % 2 != 0:
+            if len(newData) == 1 or (len(newData) - 1) % 2 != 0:
+                raise StreamBlockValidationError(non_block_errors=[_(
+                    'Rule Combination must follow the <Rule/NestedLogic>'
+                    '<Operator> <Rule/NestedLogic> pattern.')])
+
+            iterations = (len(newData) - 1) / 2
+            for i in range(iterations):
+                first_rule_index = i * 2
+                operator_index = (i * 2) + 1
+                second_rule_index = (i * 2) + 2
+
+                if not (
+                    (newData[first_rule_index] == 'Rule' or
+                     newData[first_rule_index] == 'NestedLogic') and
+                    (newData[operator_index] == 'Operator') and
+                    (newData[second_rule_index] == 'Rule' or
+                        newData[second_rule_index] == 'NestedLogic')):
+                    raise StreamBlockValidationError(non_block_errors=[_(
+                        'Rule Combination must follow the <Rule/NestedLogic> '
+                        '<Operator> <Rule/NestedLogic> pattern.')])
+        else:
             raise StreamBlockValidationError(non_block_errors=[_(
                 'Rule Combination must follow the <Rule/NestedLogic>'
                 '<Operator> <Rule/NestedLogic> pattern.')])
 
-        iterations = (len(newData) - 1) / 2
-        for i in range(iterations):
-            first_rule_index = i * 2
-            operator_index = (i * 2) + 1
-            second_rule_index = (i * 2) + 2
-
-            if not (
-                (newData[first_rule_index] == 'Rule' or
-                 newData[first_rule_index] == 'NestedLogic') and
-                (newData[operator_index] == 'Operator') and
-                (newData[second_rule_index] == 'Rule' or
-                    newData[second_rule_index] == 'NestedLogic')):
-                raise StreamBlockValidationError(non_block_errors=[_(
-                    'Rule Combination must follow the <Rule/NestedLogic> '
-                    '<Operator> <Rule/NestedLogic> pattern.')])
-
     class Meta:
         verbose_name = _('Rule Combination')