Add operator to searches (refs #1678)

1 files changed, 17 insertions, 3 deletions

diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index afcbc39ff..2dd3c519e 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -310,9 +310,19 @@ def create_user():
                                               password)
     return username, password, user
 
-def create_operation(user):
+def create_orga(user):
+    orga_type, created = OrganizationType.objects.get_or_create(
+                                                txt_idx='operator')
+    orga, created = Organization.objects.get_or_create(name='Operator',
+                                            organization_type=orga_type,
+                                            history_modifier=user)
+    return [orga]
+
+def create_operation(user, orga=None):
     dct = {'year':2010, 'operation_type_id':1,
-               'history_modifier':user,}
+           'history_modifier':user,}
+    if orga:
+        dct['operator'] = orga
     operations = [models.Operation.objects.create(**dct)]
     return operations
 
@@ -326,7 +336,8 @@ class OperationTest(TestCase):
 
     def setUp(self):
         self.username, self.password, self.user = create_user()
-        self.operations = create_operation(self.user)
+        self.orgas = create_orga(self.user)
+        self.operations = create_operation(self.user, self.orgas[0])
         self.item = self.operations[0]
 
     def testSearch(self):
@@ -337,6 +348,9 @@ class OperationTest(TestCase):
         c.login(username=self.username, password=self.password)
         response = c.get(reverse('get-operation'), {'year': '2010',})
         self.assertTrue(json.loads(response.content)['total'] == 1)
+        response = c.get(reverse('get-operation'),
+                         {'operator': self.orgas[0].pk})
+        self.assertTrue(json.loads(response.content)['total'] == 1)
 
 def create_administrativact(user, operation):
     act_type, created = models.ActType.objects.get_or_create(txt_idx='act_type')