From 12773463a6cc71884bea6e455d1786403cb4929b Mon Sep 17 00:00:00 2001
From: Xeniac
Date: Wed, 16 May 2018 11:59:08 +0200
Subject: [PATCH] * removed gender, address and phone number from the forms. *
birthday, first and last name fields will be set to None if you uncheck
membership.
---
.gitignore | 1 +
src/membership/forms.py | 11 +++-----
.../templates/membership/membership_form.html | 25 +++++++++++--------
.../templates/membership/register_form.html | 5 ++--
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index d8443f0..d991603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ backup/
.[a-zA-Z]*
local_settings.py
sample.xlsx
+venv/
diff --git a/src/membership/forms.py b/src/membership/forms.py
index 6126566..76691e4 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -25,18 +25,14 @@ class MembershipForm(forms.ModelForm):
help_text=_('Input format: yyyy-mm-dd')
)
email = forms.EmailField(label=_('Email'), required=True)
- required_membership_fields = (
- 'first_name', 'last_name', 'birthday',
- 'street_name', 'post_code', 'city'
- )
+ required_membership_fields = ('first_name', 'last_name', 'birthday')
class Meta:
"""get the user model dyamicly"""
model = auth.get_user_model()
fields = (
- 'username', 'gender', 'first_name', 'last_name', 'email', 'avatar',
- 'website', 'membership', 'birthday', 'telephone', 'street_name',
- 'post_code', 'city'
+ 'username', 'email', 'avatar',
+ 'membership', 'first_name', 'last_name', 'birthday',
)
def clean(self):
@@ -86,7 +82,6 @@ class RegistrationForm(MembershipForm):
"""Metadata to localize and customize the ModelForm."""
model = auth.get_user_model()
fields = ('first_name', 'last_name', 'username', 'email',
- 'username', 'gender', 'first_name', 'last_name', 'email',
'avatar',
'membership', 'birthday', 'telephone',
'street_name',
diff --git a/src/membership/templates/membership/membership_form.html b/src/membership/templates/membership/membership_form.html
index b075c71..ab3a7e8 100644
--- a/src/membership/templates/membership/membership_form.html
+++ b/src/membership/templates/membership/membership_form.html
@@ -17,18 +17,21 @@
-{% endblock %}
+
{% endblock %}
{% block buttonbar %}{% endblock %}
diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index bbda764..904654f 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -14,7 +14,7 @@
@@ -33,11 +33,12 @@