diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 12 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 14 |
3 files changed, 21 insertions, 9 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 44d1f742d..221eb4f82 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -834,6 +834,8 @@ DatingFormSet.form_slug = "find-040-dating" class FindSelect(HistorySelect): _model = models.Find + form_admin_name = _(u"Find - 001 - Search") + form_slug = "find-001-search" FORM_FILTERS = [ (_(u"Find origin"), [ "base_finds__cache_short_id", @@ -876,8 +878,6 @@ class FindSelect(HistorySelect): ) ] - form_admin_name = _(u"Find - 001 - Search") - form_slug = "find-001-search" search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'find' diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 5471cea23..203eb0209 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -33,7 +33,7 @@ from archaeological_warehouse.models import Warehouse, Container from bootstrap_datepicker.widgets import DatePicker from ishtar_common import widgets from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \ - ManageOldType, CustomForm, FieldType, IshtarForm + ManageOldType, CustomForm, FieldType, IshtarForm, HistorySelect from ishtar_common.models import Person, valid_id, Organization, \ get_current_profile @@ -42,8 +42,10 @@ logger = logging.getLogger(__name__) # Treatment -class TreatmentSelect(TableSelect): +class TreatmentSelect(HistorySelect): _model = models.Treatment + form_admin_name = _(u"Treatment - 001 - Search") + form_slug = "treatment-001-search" search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( @@ -614,7 +616,11 @@ class AdministrativeActTreatmentModifForm( # treatment requests -class TreatmentFileSelect(TableSelect): +class TreatmentFileSelect(HistorySelect): + _model = models.TreatmentFile + form_admin_name = _(u"Treatment file - 001 - Search") + form_slug = "treatmentfile-001-search" + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'treatmentfile' diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index fb5cdc11e..d4faff71a 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -47,7 +47,8 @@ from ishtar_common.views_item import display_item, get_item, show_item, \ from archaeological_operations.wizards import AdministrativeActDeletionWizard from archaeological_finds import wizards -get_find = get_item(models.Find, 'get_find', 'find') +get_find = get_item(models.Find, 'get_find', 'find', + search_form=forms.FindSelect) get_find_for_ope = get_item(models.Find, 'get_find', 'find', own_table_cols=models.Find.TABLE_COLS_FOR_OPE) @@ -61,7 +62,10 @@ autocomplete_find = get_autocomplete_item(model=models.Find) show_treatment = show_item(models.Treatment, 'treatment') revert_treatment = revert_item(models.Treatment) -get_treatment = get_item(models.Treatment, 'get_treatment', 'treatment') +get_treatment = get_item( + models.Treatment, 'get_treatment', 'treatment', + search_form=forms.TreatmentSelect +) display_treatment = display_item(models.Treatment) autocomplete_treatment = get_autocomplete_item(model=models.Treatment) @@ -73,8 +77,10 @@ get_administrativeacttreatment = get_item( show_treatmentfile = show_item(models.TreatmentFile, 'treatmentfile') revert_treatmentfile = revert_item(models.TreatmentFile) -get_treatmentfile = get_item(models.TreatmentFile, 'get_treatmentfile', - 'treatmentfile') +get_treatmentfile = get_item( + models.TreatmentFile, 'get_treatmentfile', 'treatmentfile', + search_form=forms.TreatmentFileSelect +) get_administrativeacttreatmentfile = get_item( AdministrativeAct, 'get_administrativeacttreatmentfile', |