diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-04-04 22:43:13 +0000 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-04-04 22:43:13 +0000 | 
| commit | ee8c9ad6004ab35e409c7041a0eba214b45c36d7 (patch) | |
| tree | a2c624b1ce76c6d57a8a156766e4863710d8ae19 /archaeological_files/models.py | |
| parent | 56aea239caffef95c481aac3b77a8d43e8d3ca35 (diff) | |
| parent | e51684c2adb656d3ef14e40e649e280a6c0bf1b8 (diff) | |
| download | Ishtar-ee8c9ad6004ab35e409c7041a0eba214b45c36d7.tar.bz2 Ishtar-ee8c9ad6004ab35e409c7041a0eba214b45c36d7.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)  | 
