summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-07-05 16:31:42 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-07-05 16:31:42 +0200
commit403bd7de61e4c692a0d3051392a745cd24d16351 (patch)
treee6f7bac7b0c04f5564e81e461f812faf4808cbe7
parent7f131cc69ae0cefa0acdb602c89143759a171809 (diff)
downloadIshtar-403bd7de61e4c692a0d3051392a745cd24d16351.tar.bz2
Ishtar-403bd7de61e4c692a0d3051392a745cd24d16351.zip
Remove non used fields for persons (closes #507)
-rw-r--r--ishtar/ishtar_base/admin.py2
-rw-r--r--ishtar/ishtar_base/forms_common.py4
-rw-r--r--ishtar/ishtar_base/models.py4
3 files changed, 1 insertions, 9 deletions
diff --git a/ishtar/ishtar_base/admin.py b/ishtar/ishtar_base/admin.py
index 3a93f1852..ace959295 100644
--- a/ishtar/ishtar_base/admin.py
+++ b/ishtar/ishtar_base/admin.py
@@ -51,7 +51,7 @@ admin.site.register(models.Organization, OrganizationAdmin)
class PersonAdmin(HistorizedObjectAdmin):
list_display = ('name', 'surname', 'email', 'person_type')
- list_filter = ("person_type", "in_charge_storage", "is_author",)
+ list_filter = ("person_type",)
search_fields = ('name', 'surname', 'email',)
model = models.Person
diff --git a/ishtar/ishtar_base/forms_common.py b/ishtar/ishtar_base/forms_common.py
index 41c91df6d..616569d94 100644
--- a/ishtar/ishtar_base/forms_common.py
+++ b/ishtar/ishtar_base/forms_common.py
@@ -173,10 +173,6 @@ class PersonForm(forms.Form):
widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-organization'),
associated_model=models.Organization, new=True),
validators=[models.valid_id(models.Organization)], required=False)
- is_author = forms.BooleanField(label=_(u"Is an author?"),
- required=False)
- in_charge_storage = forms.BooleanField(required=False,
- label=_(u"In charge of a storage?"))
def __init__(self, *args, **kwargs):
super(PersonForm, self).__init__(*args, **kwargs)
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index 42b79f163..90e593131 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -418,10 +418,6 @@ class Person(Address, OwnPerms) :
person_type = models.ForeignKey(PersonType, verbose_name=_(u"Type"))
attached_to = models.ForeignKey('Organization',
verbose_name=_(u"Is attached to"), blank=True, null=True)
- is_author = models.NullBooleanField(_(u"Is an author?"), blank=True,
- null=True)
- in_charge_storage = models.NullBooleanField(_(u"In charge of a storage?"),
- blank=True, null=True)
class Meta:
verbose_name = _(u"Person")