diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-11-14 17:13:56 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-11-14 17:13:56 +0100 | 
| commit | ca55bc46fa05ec4e1bfc8c5450389e83b95ec313 (patch) | |
| tree | 5c8f1e3f5664f8501d4fe0177187c67375aff3f1 /archaeological_operations/models.py | |
| parent | ea1ad872dec9d6beeafe6ccd4264132f5865079e (diff) | |
| parent | 2e4847a414f44600dc25fd1152c1bcff173f76de (diff) | |
| download | Ishtar-ca55bc46fa05ec4e1bfc8c5450389e83b95ec313.tar.bz2 Ishtar-ca55bc46fa05ec4e1bfc8c5450389e83b95ec313.zip | |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index cf648a43a..2f1ea3ea3 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -38,7 +38,7 @@ from ishtar_common.models import GeneralType, BaseHistorizedItem, \      SourceType, Person, Organization, Town, Dashboard, IshtarUser, ValueGetter,\      DocumentTemplate, ShortMenuItem, DashboardFormItem, GeneralRelationType,\      GeneralRecordRelations, post_delete_record_relation, OperationType, \ -    ImageModel, post_save_cache, PersonType +    ImageModel, post_save_cache, PersonType, IshtarImage  class RemainType(GeneralType): @@ -352,6 +352,8 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,      comment = models.TextField(_(u"General comment"), null=True, blank=True)      scientific_documentation_comment = models.TextField(          _(u"Comment about scientific documentation"), null=True, blank=True) +    images = models.ManyToManyField(IshtarImage, verbose_name=_(u"Images"), +                                    blank=True)      cached_label = models.CharField(_(u"Cached name"), max_length=500,                                      null=True, blank=True, db_index=True)      archaeological_sites = models.ManyToManyField( | 
