diff options
| author | root <root@viserion.(none)> | 2013-04-04 22:43:13 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-04-04 22:43:13 +0000 |
| commit | 0b9a486b5e79d36c7eb7fa9592e1ebb4ec9ae668 (patch) | |
| tree | a2c624b1ce76c6d57a8a156766e4863710d8ae19 /archaeological_files/models.py | |
| parent | 199f535e39880d6ddbbe6a068378fec7ff9fc084 (diff) | |
| parent | b2a879890cef5721accff66904be478de488b120 (diff) | |
| download | Ishtar-0b9a486b5e79d36c7eb7fa9592e1ebb4ec9ae668.tar.bz2 Ishtar-0b9a486b5e79d36c7eb7fa9592e1ebb4ec9ae668.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_files/models.py')
| -rw-r--r-- | archaeological_files/models.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index a91f6ed69..1e2c36ed0 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -133,6 +133,10 @@ class File(BaseHistorizedItem, OwnPerms): for k in ['internal_reference',] if getattr(self, k)] return settings.JOINT.join(items) + def grouped_parcels(self): + from archaeological_operations.models import Parcel + return Parcel.grouped_parcels(list(self.parcels.all())) + @classmethod def get_query_owns(cls, user): return Q(history_modifier=user) & Q(end_date__isnull=True) |