diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:53:23 +0100 |
commit | 9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6 (patch) | |
tree | 2a2b687acef6f878c05f7148a150c10c3a7fb71a /archaeological_files/models.py | |
parent | 8eb09a666e7048ce8e531649566418670d94036d (diff) | |
parent | c00bb6298a602f74c55cfd60b8601295470a8e3b (diff) | |
download | Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.tar.bz2 Ishtar-9eacb3f2b2f5819ef3eea1a54bb2c4bfb13efda6.zip |
Merge branch 'master' into v0.9
Conflicts:
Makefile.example
archaeological_operations/migrations/0061_regenerate_cached_label.py
archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py
Diffstat (limited to 'archaeological_files/models.py')
-rw-r--r-- | archaeological_files/models.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index c8134f28f..7f37a298f 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -236,6 +236,11 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, return _(u"FILE") @property + def full_internal_ref(self): + return u"{}{}".format(settings.ISHTAR_FILE_PREFIX or '', + self.external_id or '') + + @property def delay_date(self): cache_key, val = get_cache(self.__class__, [self.pk, 'delay_date']) if val: |