diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/forms_common.py | 8 | ||||
| -rw-r--r-- | ishtar_common/models.py | 13 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_document.html | 1 |
3 files changed, 15 insertions, 7 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 16c6d269e..fadda7593 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -51,6 +51,7 @@ from ishtar_common.utils import is_downloadable, clean_session_cache, \ from archaeological_operations.models import Operation from archaeological_context_records.models import ContextRecord from archaeological_finds.models import Find +from archaeological_warehouse.models import Container def get_town_field(label=_(u"Town"), required=True): @@ -1270,6 +1271,12 @@ class DocumentSelect(TableSelect): validators=[models.valid_id(Find)]) find__denomination = forms.CharField(label=_(u"Find - denomination"), required=False) + container = forms.IntegerField( + label=_(u"Container"), required=False, + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-container'), + associated_model=Container), + validators=[models.valid_id(Container)]) TYPES = [ FieldType('source_type', models.SourceType), @@ -1278,6 +1285,7 @@ class DocumentSelect(TableSelect): PROFILE_FILTER = { 'context_record': ['context_record'], 'find': ['find'], + 'warehouse': ['container'] } diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a37c1f6bc..b03604e26 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3831,12 +3831,12 @@ class Document(BaseHistorizedItem, OwnPerms, ImageModel): # other will be symbolic links RELATED_MODELS = [ 'treatment_files', 'treatments', 'finds', 'context_records', - 'operations', 'sites', 'warehouses', 'files' + 'operations', 'sites', 'warehouses', 'containers', 'files' ] # same fields but in order for forms RELATED_MODELS_ALT = [ 'finds', 'context_records', 'operations', 'sites', 'files', - 'warehouses', 'treatments', 'treatment_files', + 'warehouses', 'containers', 'treatments', 'treatment_files', ] SLUG = 'document' LINK_SPLIT = u"<||>" @@ -3926,6 +3926,10 @@ class Document(BaseHistorizedItem, OwnPerms, ImageModel): pgettext_lazy("key for text search", u"file"), 'files__cached_label__iexact' ), + 'container': SearchAltName( + pgettext_lazy("key for text search", u"container"), + 'containers__cached_label__iexact' + ), 'site': SearchAltName( pgettext_lazy("key for text search", u"site"), 'sites__cached_label__iexact' @@ -3937,11 +3941,6 @@ class Document(BaseHistorizedItem, OwnPerms, ImageModel): } objects = ExternalIdManager() - - RELATED_MODELS_ALT = [ - 'finds', 'context_records', 'operations', 'sites', 'files', - 'warehouses', 'treatments', 'treatment_files', - ] RELATIVE_SESSION_NAMES = [ ('find', 'finds__pk'), ('contextrecord', 'context_records__pk'), diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index af94f8fbe..48d21ff00 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -57,6 +57,7 @@ {% field_flex_full "Treatments" item.treatments|add_links %} {% field_flex_full "Treatment files" item.treatment_files|add_links %} {% field_flex_full "Warehouses" item.warehouses|add_links %} +{% field_flex_full "Containers" item.containers|add_links %} {% endif %} {% endblock %} |