diff options
| -rw-r--r-- | archaeological_operations/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 8 | ||||
| -rw-r--r-- | ishtar_common/views.py | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 66bd05b4b..0318d4207 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -122,6 +122,8 @@ class OperationSelect(TableSelect): associated_model=Person, new=True), label=_(u"In charge")) remains = forms.ChoiceField(label=_(u"Remains"), choices=models.RemainType.get_types()) + periods = forms.ChoiceField(label=_(u"Periods"), + choices=models.Period.get_types()) year = forms.IntegerField(label=_("Year")) start_before = forms.DateField(label=_(u"Started before"), widget=widgets.JQueryDate) diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 6e570fc97..1ce4c4622 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -92,14 +92,6 @@ def get_available_operation_code(request, year=None): data = json.dumps({'id':models.Operation.get_available_operation_code(year)}) return HttpResponse(data, mimetype='text/plain') -def get_parcel_parser(key_section, key_number): - def func(dct): - print dct - section, number = dct.get(key_section), dct.get(key_number) - if not section or not number: - return {} - return {key_section:section, key_number:number} - get_operation = get_item(models.Operation, 'get_operation', 'operation', bool_fields = ['end_date__isnull'], dated_fields = ['start_date__lte', 'start_date__gte', diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 0d0168bb9..641ca8046 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -170,7 +170,7 @@ def format_val(val): return unicode(val) HIERARCHIC_LEVELS = 5 -HIERARCHIC_FIELDS = ['period', 'unit', 'material_type'] +HIERARCHIC_FIELDS = ['periods', 'period', 'unit', 'material_type'] PRIVATE_FIELDS = ('id', 'history_modifier', 'order') def get_item(model, func_name, default_name, extra_request_keys=[], base_request={}, bool_fields=[], dated_fields=[]): |