diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-30 19:53:55 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-30 19:53:55 +0100 |
| commit | aa3ec36a9ba699e3c9354367e8adcde57070a58d (patch) | |
| tree | 2a08d17649b93466dabcbe75b38733b1b840a53f | |
| parent | 5700812bbd67059435d1b2964dedddb489a174dd (diff) | |
| download | Ishtar-aa3ec36a9ba699e3c9354367e8adcde57070a58d.tar.bz2 Ishtar-aa3ec36a9ba699e3c9354367e8adcde57070a58d.zip | |
Head scientist is not mandatory (closes #149)
| -rw-r--r-- | ishtar/furnitures/forms.py | 2 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index c7e3a3199..41c6de439 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -1158,7 +1158,7 @@ class OperationFormGeneral(forms.Form): [unicode(models.PersonType.objects.get(txt_idx='head_scientist').pk), unicode(models.PersonType.objects.get(txt_idx='sra_agent').pk)])]), associated_model=models.Person), - validators=[models.valid_id(models.Person)]) + validators=[models.valid_id(models.Person)], required=False) associated_file = forms.IntegerField(label=_("Archaelogical file"), widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-file'), associated_model=models.File), diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index dc9253fdd..ffca27df0 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -348,8 +348,8 @@ class RemainType(GeneralType): class Operation(BaseHistorizedItem, OwnPerms): start_date = models.DateField(_(u"Start date"), null=True, blank=True) end_date = models.DateField(_(u"Closing date"), null=True, blank=True) - in_charge = models.ForeignKey('Person', related_name='+', - verbose_name=_(u"In charge")) + in_charge = models.ForeignKey('Person', related_name='+', null=True, + blank=True, verbose_name=_(u"In charge")) year = models.IntegerField(_(u"Year")) operation_code = models.IntegerField(_(u"Operation code")) associated_file = models.ForeignKey(File, related_name='+', |