cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Rework account create

Browse source 
- Affichage des erreurs en cas... d'erreurs !
This commit is contained in:
Aurélien Delobelle 2016-09-01 05:01:59 +02:00
parent cbf9018bb9
commit 9534771cd9
4 changed files with 105 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kfet/forms.py
View file

@ -83,7 +83,8 @@ class CofRestrictForm(CofForm):
class UserForm(forms.ModelForm): class UserForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
new_user = kwargs.get('instance') is None from_clipper = kwargs.pop('from_clipper', False)
new_user = kwargs.get('instance') is None and not from_clipper
super(UserForm, self).__init__(*args, **kwargs) super(UserForm, self).__init__(*args, **kwargs)
if new_user: if new_user:
self.fields['username'].validators = [MinLengthValidator(9)] self.fields['username'].validators = [MinLengthValidator(9)]

7
kfet/templates/kfet/account_create.html
View file

@ -14,11 +14,14 @@
{% include 'kfet/base_messages.html' %} {% include 'kfet/base_messages.html' %}
<form action="{% url "kfet.account.create" %}" method="post"> <form action="{% url "kfet.account.create" %}" method="post">
{{ account_trigramme_form }} {% csrf_token %}
{{ trigramme_form }}
<div id="trigramme_valid"></div> <div id="trigramme_valid"></div>
<input type="text" name="q" id="search_autocomplete" spellcheck="false" placeholder="Chercher un utilisateur par nom, prénom ou identifiant clipper"> <input type="text" name="q" id="search_autocomplete" spellcheck="false" placeholder="Chercher un utilisateur par nom, prénom ou identifiant clipper">
<div id="search_results"></div> <div id="search_results"></div>
<div id="form-placeholder"></div> <div id="form-placeholder">
{% include 'kfet/account_create_form.html' %}
</div>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

1
kfet/templates/kfet/account_create_form.html
View file

@ -1,4 +1,3 @@
{% csrf_token %}
{{ user_form.as_p }} {{ user_form.as_p }}
{{ cof_form.as_p }} {{ cof_form.as_p }}
{{ account_form.as_p }} {{ account_form.as_p }}

171
kfet/views.py
View file

@ -86,64 +86,62 @@ def account_is_validandfree_ajax(request):
@teamkfet_required @teamkfet_required
def account_create(request): def account_create(request):
# A envoyer au template
data_template = {
'account_trigramme_form': AccountTriForm(),
}
# Enregistrement # Enregistrement
if request.method == "POST": if request.method == "POST":
# Pour indiquer la tentative d'enregistrement au template trigramme_form = AccountTriForm(request.POST)
# Checking permission
if not request.user.has_perm('kfet.add_account'):
raise PermissionDenied
# Peuplement des forms # Peuplement des forms
username = request.POST.get('username') username = request.POST.get('username')
try: login_clipper = request.POST.get('login_clipper')
user = User.objects.get(username=username)
(cof, _) = CofProfile.objects.get_or_create(user=user) forms = get_account_create_forms(
user_form = UserForm(request.POST, instance=user) request, username=username, login_clipper=login_clipper)
cof_form = CofForm(request.POST, instance=cof)
except User.DoesNotExist: account_form = forms['account_form']
user_form = UserForm(request.POST) cof_form = forms['cof_form']
cof_form = CofForm(request.POST) user_form = forms['user_form']
trigramme_form = AccountTriForm(request.POST)
account_form = AccountNoTriForm(request.POST)
if all((user_form.is_valid(), cof_form.is_valid(), if all((user_form.is_valid(), cof_form.is_valid(),
trigramme_form.is_valid(), account_form.is_valid())): trigramme_form.is_valid(), account_form.is_valid())):
data = {} # Checking permission
# Fill data for Account.save() if not request.user.has_perm('kfet.add_account'):
put_cleaned_data_in_dict(data, user_form) messages.error(request, 'Permission refusée')
put_cleaned_data_in_dict(data, cof_form) else:
data = {}
# Fill data for Account.save()
put_cleaned_data_in_dict(data, user_form)
put_cleaned_data_in_dict(data, cof_form)
try: try:
account = trigramme_form.save(data = data) account = trigramme_form.save(data = data)
account_form = AccountNoTriForm(request.POST, instance=account) account_form = AccountNoTriForm(request.POST, instance=account)
account_form.save() account_form.save()
messages.success(request, 'Compte créé : %s' % account.trigramme) messages.success(request, 'Compte créé : %s' % account.trigramme)
except Account.UserHasAccount as e: return redirect('kfet.account.create')
messages.error(request, \ except Account.UserHasAccount as e:
"Cet utilisateur a déjà un compte K-Fêt : %s" % e.trigramme) messages.error(request, \
else: "Cet utilisateur a déjà un compte K-Fêt : %s" % e.trigramme)
messages.error(request, user_form.errors) else:
messages.error(request, cof_form.errors) trigramme_form = AccountTriForm()
messages.error(request, trigramme_form.errors) account_form = None
messages.error(request, account_form.errors) cof_form = None
user_form = None
return render(request, "kfet/account_create.html", data_template) return render(request, "kfet/account_create.html", {
'trigramme_form': trigramme_form,
'account_form': account_form,
'cof_form': cof_form,
'user_form': user_form,
})
def account_form_set_readonly_fields(user_form, cof_form): def account_form_set_readonly_fields(user_form, cof_form):
user_form.fields['username'].widget.attrs['readonly'] = True user_form.fields['username'].widget.attrs['readonly'] = True
cof_form.fields['login_clipper'].widget.attrs['readonly'] = True cof_form.fields['login_clipper'].widget.attrs['readonly'] = True
cof_form.fields['is_cof'].widget.attrs['disabled'] = True cof_form.fields['is_cof'].widget.attrs['disabled'] = True
@login_required def get_account_create_forms(request=None, username=None, login_clipper=None):
@teamkfet_required
def account_create_ajax(request, username=None, login_clipper=None):
user = None user = None
clipper = None
if login_clipper: if login_clipper:
# à partir d'un clipper # à partir d'un clipper
# le user associé à ce clipper ne devrait pas encore exister # le user associé à ce clipper ne devrait pas encore exister
@ -157,53 +155,82 @@ def account_create_ajax(request, username=None, login_clipper=None):
except User.DoesNotExist: except User.DoesNotExist:
# Clipper (sans user déjà existant) # Clipper (sans user déjà existant)
# UserForm - Prefill + Création # UserForm - Prefill
user_initial_data = { user_initial = {
'username' : login_clipper, 'username' : login_clipper,
'email' : "%s@clipper.ens.fr" % login_clipper} 'email' : "%s@clipper.ens.fr" % login_clipper}
if clipper.fullname: if clipper.fullname:
# Prefill du nom et prénom # Prefill du nom et prénom
names = clipper.fullname.split() names = clipper.fullname.split()
# Le premier, c'est le prénom # Le premier, c'est le prénom
user_initial_data['first_name'] = names[0] user_initial['first_name'] = names[0]
if len(names) > 1: if len(names) > 1:
# Si d'autres noms -> tous dans le nom de famille # Si d'autres noms -> tous dans le nom de famille
user_initial_data['last_name'] = " ".join(names[1:]) user_initial['last_name'] = " ".join(names[1:])
user_form = UserForm(initial = user_initial_data) # CofForm - Prefill
cof_initial = { 'login_clipper': login_clipper }
# CofForm - Prefill + Création # Form créations
cof_initial_data = { 'login_clipper': login_clipper } if request:
cof_form = CofForm(initial = cof_initial_data) user_form = UserForm(request.POST, initial=user_initial, from_clipper=True)
cof_form = CofForm(request.POST, initial=cof_initial)
# AccountForm else:
account_form = AccountForm() user_form = UserForm(initial=user_initial)
cof_form = CofForm(initial=cof_initial)
# Protection (read-only) des champs username et login_clipper # Protection (read-only) des champs username et login_clipper
account_form_set_readonly_fields(user_form, cof_form) account_form_set_readonly_fields(user_form, cof_form)
if username: if username and not login_clipper:
# le user existe déjà try:
user = get_object_or_404(User, username=username) user = User.objects.get(username=username)
# récupération du profil cof # le user existe déjà
(cof, _) = CofProfile.objects.get_or_create(user=user) # récupération du profil cof
# UserForm + CofForm - Création à partir des instances existantes (cof, _) = CofProfile.objects.get_or_create(user=user)
user_form = UserForm(instance = user) # UserForm + CofForm - Création à partir des instances existantes
cof_form = CofForm(instance = cof) if request:
# AccountForm user_form = UserForm(request.POST, instance = user)
account_form = AccountNoTriForm() cof_form = CofForm(request.POST, instance = cof)
# Protection (read-only) des champs username et login_clipper else:
account_form_set_readonly_fields(user_form, cof_form) user_form = UserForm(instance=user)
elif not login_clipper: cof_form = CofForm(instance=cof)
# Protection (read-only) des champs username, login_clipper et is_cof
account_form_set_readonly_fields(user_form, cof_form)
except User.DoesNotExist:
# le username donnée n'existe pas -> Création depuis rien
# (éventuellement en cours avec erreurs précédemment)
pass
if not user and not clipper:
# connaît pas du tout, faut tout remplir # connaît pas du tout, faut tout remplir
user_form = UserForm() if request:
cof_form = CofForm() user_form = UserForm(request.POST)
account_form = AccountNoTriForm() cof_form = CofForm(request.POST)
else:
user_form = UserForm()
cof_form = CofForm()
# mais on laisse le username en écriture
cof_form.fields['login_clipper'].widget.attrs['readonly'] = True cof_form.fields['login_clipper'].widget.attrs['readonly'] = True
cof_form.fields['is_cof'].widget.attrs['disabled'] = True cof_form.fields['is_cof'].widget.attrs['disabled'] = True
if request:
account_form = AccountNoTriForm(request.POST)
else:
account_form = AccountNoTriForm()
return {
'account_form': account_form,
'cof_form': cof_form,
'user_form': user_form,
}
@login_required
@teamkfet_required
def account_create_ajax(request, username=None, login_clipper=None):
forms = get_account_create_forms(request=None, username=username, login_clipper=login_clipper)
return render(request, "kfet/account_create_form.html", { return render(request, "kfet/account_create_form.html", {
'account_form' : account_form, 'account_form' : forms['account_form'],
'cof_form' : cof_form, 'cof_form' : forms['cof_form'],
'user_form' : user_form, 'user_form' : forms['user_form'],
}) })
# Account - Read # Account - Read
@ -280,7 +307,6 @@ def account_update(request, trigramme):
# Fill data for Account.save() # Fill data for Account.save()
put_cleaned_data_in_dict(data, user_form) put_cleaned_data_in_dict(data, user_form)
put_cleaned_data_in_dict(data, cof_form) put_cleaned_data_in_dict(data, cof_form)
print(vars(account.negative))
# Updating # Updating
account_form.save(data = data) account_form.save(data = data)
@ -289,7 +315,6 @@ def account_update(request, trigramme):
if (request.user.has_perm('kfet.manage_perms') if (request.user.has_perm('kfet.manage_perms')
and group_form.is_valid()): and group_form.is_valid()):
group_form.save() group_form.save()
print(vars(account.negative))
# Checking perm to manage negative # Checking perm to manage negative
if hasattr(account, 'negative'): if hasattr(account, 'negative'):