Document templates: add town values for archaeological operations and archaeological files

2 files changed, 15 insertions, 0 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index dd8db7a6e..a94e4be86 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -147,6 +147,12 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter):
                                                             self.towns.count())
         values['adminact_associated_file_towns'] = u", ".join(
                                    [unicode(town)for town in self.towns.all()])
+
+        values[prefix+'towns'] = ''
+        values[prefix+'towns_count'] = unicode(self.towns.count())
+        if self.towns.count():
+            values[prefix+'towns'] = u", ".join([town.name
+                                 for town in self.towns.all().order_by('name')])
         return values
 
     def __unicode__(self):
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 6a90b92b7..ae50b1a28 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -189,6 +189,15 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter):
         self.save()
         return self.cached_label
 
+    def get_values(self, prefix=''):
+        values = super(Operation, self).get_values(prefix=prefix)
+        values[prefix+'towns'] = ''
+        values[prefix+'towns_count'] = unicode(self.towns.count())
+        if self.towns.count():
+            values[prefix+'towns'] = u", ".join([town.name
+                                 for town in self.towns.all().order_by('name')])
+        return values
+
     @property
     def short_class_name(self):
         return _(u"OPE")