diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/forms.py | 12 | ||||
| -rw-r--r-- | archaeological_warehouse/locale/django.pot | 24 |
2 files changed, 19 insertions, 17 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index d56df8139..b34be3ab3 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -26,7 +26,7 @@ from archaeological_finds.models import TreatmentType, FindBasket import models from ishtar_common import widgets from ishtar_common.forms import name_validator, reverse_lazy, \ - get_form_selection, TableSelect + get_form_selection, TableSelect, ManageOldType from archaeological_finds.forms import FindMultipleFormSelection, \ SelectFindBasketForm @@ -39,7 +39,7 @@ def get_warehouse_field(label=_(u"Warehouse"), required=True): validators=[valid_id(models.Warehouse)]) -class WarehouseForm(forms.Form): +class WarehouseForm(ManageOldType, forms.Form): name = forms.CharField(label=_(u"Name"), max_length=40, validators=[name_validator]) warehouse_type = forms.ChoiceField(label=_(u"Warehouse type"), @@ -71,7 +71,8 @@ class WarehouseForm(forms.Form): kwargs.pop('limits') super(WarehouseForm, self).__init__(*args, **kwargs) self.fields['warehouse_type'].choices = \ - models.WarehouseType.get_types() + models.WarehouseType.get_types( + initial=self.init_data.get('warehouse_type')) self.fields['warehouse_type'].help_text = \ models.WarehouseType.get_help() @@ -88,7 +89,7 @@ class WarehouseForm(forms.Form): return new_item -class ContainerForm(forms.Form): +class ContainerForm(ManageOldType, forms.Form): form_label = _(u"Container") reference = forms.CharField(label=_(u"Ref.")) container_type = forms.ChoiceField(label=_(u"Container type"), choices=[]) @@ -106,7 +107,8 @@ class ContainerForm(forms.Form): kwargs.pop('limits') super(ContainerForm, self).__init__(*args, **kwargs) self.fields['container_type'].choices = \ - models.ContainerType.get_types() + models.ContainerType.get_types( + initial=self.init_data.get('container_type')) self.fields['container_type'].help_text = \ models.ContainerType.get_help() diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 264ef3791..c00e26082 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" -#: forms.py:34 forms.py:96 models.py:44 models.py:73 +#: forms.py:34 forms.py:97 models.py:44 models.py:73 msgid "Warehouse" msgstr "" @@ -22,7 +22,7 @@ msgstr "" msgid "Person in charge" msgstr "" -#: forms.py:54 forms.py:101 models.py:41 models.py:77 +#: forms.py:54 forms.py:102 models.py:41 models.py:77 msgid "Comment" msgstr "" @@ -50,43 +50,43 @@ msgstr "" msgid "Phone" msgstr "" -#: forms.py:92 models.py:80 +#: forms.py:93 models.py:80 msgid "Container" msgstr "" -#: forms.py:93 forms.py:127 models.py:63 +#: forms.py:94 forms.py:129 models.py:63 msgid "Ref." msgstr "" -#: forms.py:94 forms.py:126 models.py:66 models.py:75 +#: forms.py:95 forms.py:128 models.py:66 models.py:75 msgid "Container type" msgstr "" -#: forms.py:137 +#: forms.py:139 msgid "Container search" msgstr "" -#: forms.py:139 +#: forms.py:141 msgid "You should select a container." msgstr "" -#: forms.py:140 +#: forms.py:142 msgid "Add a new container" msgstr "" -#: forms.py:144 ishtar_menu.py:33 views.py:94 +#: forms.py:146 ishtar_menu.py:33 views.py:94 msgid "Packaging" msgstr "" -#: forms.py:151 +#: forms.py:153 msgid "Packager" msgstr "" -#: forms.py:157 +#: forms.py:159 msgid "Date" msgstr "" -#: forms.py:166 +#: forms.py:168 msgid "Packaged finds" msgstr "" |