* removed gender, address and phone number from the forms.
* birthday, first and last name fields will be set to None if you uncheck membership.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -71,3 +71,4 @@ backup/
|
|||||||
.[a-zA-Z]*
|
.[a-zA-Z]*
|
||||||
local_settings.py
|
local_settings.py
|
||||||
sample.xlsx
|
sample.xlsx
|
||||||
|
venv/
|
||||||
|
|||||||
@@ -25,18 +25,14 @@ class MembershipForm(forms.ModelForm):
|
|||||||
help_text=_('Input format: yyyy-mm-dd')
|
help_text=_('Input format: yyyy-mm-dd')
|
||||||
)
|
)
|
||||||
email = forms.EmailField(label=_('Email'), required=True)
|
email = forms.EmailField(label=_('Email'), required=True)
|
||||||
required_membership_fields = (
|
required_membership_fields = ('first_name', 'last_name', 'birthday')
|
||||||
'first_name', 'last_name', 'birthday',
|
|
||||||
'street_name', 'post_code', 'city'
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
"""get the user model dyamicly"""
|
"""get the user model dyamicly"""
|
||||||
model = auth.get_user_model()
|
model = auth.get_user_model()
|
||||||
fields = (
|
fields = (
|
||||||
'username', 'gender', 'first_name', 'last_name', 'email', 'avatar',
|
'username', 'email', 'avatar',
|
||||||
'website', 'membership', 'birthday', 'telephone', 'street_name',
|
'membership', 'first_name', 'last_name', 'birthday',
|
||||||
'post_code', 'city'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
@@ -86,7 +82,6 @@ class RegistrationForm(MembershipForm):
|
|||||||
"""Metadata to localize and customize the ModelForm."""
|
"""Metadata to localize and customize the ModelForm."""
|
||||||
model = auth.get_user_model()
|
model = auth.get_user_model()
|
||||||
fields = ('first_name', 'last_name', 'username', 'email',
|
fields = ('first_name', 'last_name', 'username', 'email',
|
||||||
'username', 'gender', 'first_name', 'last_name', 'email',
|
|
||||||
'avatar',
|
'avatar',
|
||||||
'membership', 'birthday', 'telephone',
|
'membership', 'birthday', 'telephone',
|
||||||
'street_name',
|
'street_name',
|
||||||
|
|||||||
@@ -17,18 +17,21 @@
|
|||||||
</p>
|
</p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
{% endblock %}
|
<script type="text/javascript">
|
||||||
|
function togglePersonalData(event) {
|
||||||
|
var membership = document.getElementById("id_membership").checked;
|
||||||
|
var input_elements = ["id_first_name", "id_last_name", "id_birthday"];
|
||||||
|
for (var i = 0; i < input_elements.length; i++) {
|
||||||
|
element_id = input_elements[i]
|
||||||
|
element = document.getElementById(element_id);
|
||||||
|
element.disabled = !membership;
|
||||||
|
if (membership == 0) {element.value = ""};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
{% block javascript %}
|
document.addEventListener('DOMContentLoaded',function() {document.querySelector('#id_membership').onchange=togglePersonalData;},false);
|
||||||
$(function() {
|
togglePersonalData();
|
||||||
$( "#id_birthday" ).datepicker({
|
</script>
|
||||||
changeMonth: true,
|
|
||||||
changeYear: true,
|
|
||||||
dateFormat: 'yy-mm-dd',
|
|
||||||
yearRange: '-50,0',
|
|
||||||
firstDay: 1
|
|
||||||
});
|
|
||||||
});
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block buttonbar %}{% endblock %}
|
{% block buttonbar %}{% endblock %}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
<fieldset class="grid_5">
|
<fieldset class="grid_5">
|
||||||
<legend>{% trans "Club membership"%}</legend>
|
<legend>{% trans "Club membership"%}</legend>
|
||||||
{% get_fieldset "membership, first_name, last_name, gender, birthday, street_name, post_code, city, telephone" from form as form2 %}
|
{% get_fieldset "membership, first_name, last_name, birthday" from form as form2 %}
|
||||||
{% with form2 as form %}{% include "form.html" %}{% endwith %}
|
{% with form2 as form %}{% include "form.html" %}{% endwith %}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
@@ -33,11 +33,12 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function togglePersonalData(event) {
|
function togglePersonalData(event) {
|
||||||
var membership = document.getElementById("id_membership").checked;
|
var membership = document.getElementById("id_membership").checked;
|
||||||
var input_elements = ["id_first_name", "id_last_name", "id_gender", "id_birthday", "id_street_name", "id_post_code", "id_city", "id_telephone"];
|
var input_elements = ["id_first_name", "id_last_name", "id_birthday"];
|
||||||
for (var i = 0; i < input_elements.length; i++) {
|
for (var i = 0; i < input_elements.length; i++) {
|
||||||
element_id = input_elements[i]
|
element_id = input_elements[i]
|
||||||
element = document.getElementById(element_id);
|
element = document.getElementById(element_id);
|
||||||
element.disabled = !membership;
|
element.disabled = !membership;
|
||||||
|
if (membership == 0) {element.value = ""};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user