Document generation: simplify and add departments

1 files changed, 3 insertions, 12 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 4483e6401..391a3e8ce 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -32,6 +32,8 @@ from ishtar_common.models import GeneralType, BaseHistorizedItem, \
     HistoricalRecords, OwnPerms, Person, Organization, Department, Town, \
     Dashboard, DashboardFormItem, IshtarUser, ValueGetter, ShortMenuItem
 
+from archaeological_operations.models import get_values_town_related
+
 class FileType(GeneralType):
     class Meta:
         verbose_name = _(u"Archaeological file type")
@@ -232,18 +234,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem,
 
     def get_values(self, prefix=''):
         values = super(File, self).get_values(prefix=prefix)
-        values['adminact_associated_file_towns_count'] = unicode(
-                                                            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')])
-        values[prefix+'parcellist'] = self.render_parcels()
-        return values
+        return get_values_town_related(self, prefix, values)
 
     def render_parcels(self):
         from archaeological_operations.models import Parcel