rezometz
/
re2o
mirror of https://gitlab.federez.net/re2o/re2o
8
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Labels corrects sur les boutons de validation

rewrite_authors
Gabriel Detraz 8 years ago
committed by root
parent
f0ab6f8e47
commit
cf3ed1bb75
4 changed files with 79 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      machines/templates/machines/machine.html
  2. 98
      machines/views.py
  3. 2
      users/templates/users/user.html
  4. 44
      users/views.py

2
machines/templates/machines/machine.html
View File

@ -146,7 +146,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h3>Ipv6</h3> <h3>Ipv6</h3>
{% bootstrap_form ipv6form %} {% bootstrap_form ipv6form %}
{% endif %} {% endif %}
{% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %} {% bootstrap_button action_name button_type="submit" icon="star" %}
</form> </form>
<br /> <br />
<br /> <br />

98
machines/views.py
View File

@ -263,7 +263,8 @@ def new_machine(request, user, userid):
'machineform': machine, 'machineform': machine,
'interfaceform': interface, 'interfaceform': interface,
'domainform': domain, 'domainform': domain,
'i_mbf_param': i_mbf_param 'i_mbf_param': i_mbf_param,
'action_name' : 'Créer une machine'
}, },
'machines/machine.html', 'machines/machine.html',
request request
@ -304,7 +305,13 @@ def edit_interface(request, interface_instance, interfaceid):
kwargs={'userid':str(interface_instance.machine.user.id)} kwargs={'userid':str(interface_instance.machine.user.id)}
)) ))
i_mbf_param = generate_ipv4_mbf_param( interface_form, False ) i_mbf_param = generate_ipv4_mbf_param( interface_form, False )
return form({'machineform': machine_form, 'interfaceform': interface_form, 'domainform': domain_form, 'i_mbf_param': i_mbf_param}, 'machines/machine.html', request) return form({
'machineform': machine_form,
'interfaceform': interface_form,
'domainform': domain_form,
'i_mbf_param': i_mbf_param,
'action_name' : 'Editer une interface'
}, 'machines/machine.html', request)
@login_required @login_required
@can_delete(Machine) @can_delete(Machine)
@ -350,7 +357,12 @@ def new_interface(request, machine, machineid):
kwargs={'userid':str(machine.user.id)} kwargs={'userid':str(machine.user.id)}
)) ))
i_mbf_param = generate_ipv4_mbf_param( interface_form, False ) i_mbf_param = generate_ipv4_mbf_param( interface_form, False )
return form({'interfaceform': interface_form, 'domainform': domain_form, 'i_mbf_param': i_mbf_param}, 'machines/machine.html', request) return form({
'interfaceform': interface_form,
'domainform': domain_form,
'i_mbf_param': i_mbf_param,
'action_name' : 'Créer une interface'
}, 'machines/machine.html', request)
@login_required @login_required
@can_delete(Interface) @can_delete(Interface)
@ -387,7 +399,7 @@ def new_ipv6list(request, interface, interfaceid):
'machines:index-ipv6', 'machines:index-ipv6',
kwargs={'interfaceid':str(interface.id)} kwargs={'interfaceid':str(interface.id)}
)) ))
return form({'ipv6form': ipv6}, 'machines/machine.html', request) return form({'ipv6form': ipv6, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Ipv6List) @can_edit(Ipv6List)
@ -404,7 +416,7 @@ def edit_ipv6list(request, ipv6list_instance, ipv6listid):
'machines:index-ipv6', 'machines:index-ipv6',
kwargs={'interfaceid':str(ipv6list_instance.interface.id)} kwargs={'interfaceid':str(ipv6list_instance.interface.id)}
)) ))
return form({'ipv6form': ipv6}, 'machines/machine.html', request) return form({'ipv6form': ipv6, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete(Ipv6List) @can_delete(Ipv6List)
@ -435,7 +447,7 @@ def add_iptype(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Ce type d'ip a été ajouté") messages.success(request, "Ce type d'ip a été ajouté")
return redirect(reverse('machines:index-iptype')) return redirect(reverse('machines:index-iptype'))
return form({'iptypeform': iptype}, 'machines/machine.html', request) return form({'iptypeform': iptype, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(IpType) @can_edit(IpType)
@ -450,7 +462,7 @@ def edit_iptype(request, iptype_instance, iptypeid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in iptype.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in iptype.changed_data))
messages.success(request, "Type d'ip modifié") messages.success(request, "Type d'ip modifié")
return redirect(reverse('machines:index-iptype')) return redirect(reverse('machines:index-iptype'))
return form({'iptypeform': iptype}, 'machines/machine.html', request) return form({'iptypeform': iptype, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(IpType) @can_delete_set(IpType)
@ -468,7 +480,7 @@ def del_iptype(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Le type d'ip %s est affectée à au moins une machine, vous ne pouvez pas le supprimer" % iptype_del) messages.error(request, "Le type d'ip %s est affectée à au moins une machine, vous ne pouvez pas le supprimer" % iptype_del)
return redirect(reverse('machines:index-iptype')) return redirect(reverse('machines:index-iptype'))
return form({'iptypeform': iptype}, 'machines/machine.html', request) return form({'iptypeform': iptype, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(MachineType) @can_create(MachineType)
@ -482,7 +494,7 @@ def add_machinetype(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Ce type de machine a été ajouté") messages.success(request, "Ce type de machine a été ajouté")
return redirect(reverse('machines:index-machinetype')) return redirect(reverse('machines:index-machinetype'))
return form({'machinetypeform': machinetype}, 'machines/machine.html', request) return form({'machinetypeform': machinetype, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(MachineType) @can_edit(MachineType)
@ -496,7 +508,7 @@ def edit_machinetype(request, machinetype_instance, machinetypeid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in machinetype.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in machinetype.changed_data))
messages.success(request, "Type de machine modifié") messages.success(request, "Type de machine modifié")
return redirect(reverse('machines:index-machinetype')) return redirect(reverse('machines:index-machinetype'))
return form({'machinetypeform': machinetype}, 'machines/machine.html', request) return form({'machinetypeform': machinetype, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(MachineType) @can_delete_set(MachineType)
@ -513,7 +525,7 @@ def del_machinetype(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Le type de machine %s est affectée à au moins une machine, vous ne pouvez pas le supprimer" % machinetype_del) messages.error(request, "Le type de machine %s est affectée à au moins une machine, vous ne pouvez pas le supprimer" % machinetype_del)
return redirect(reverse('machines:index-machinetype')) return redirect(reverse('machines:index-machinetype'))
return form({'machinetypeform': machinetype}, 'machines/machine.html', request) return form({'machinetypeform': machinetype, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Extension) @can_create(Extension)
@ -527,7 +539,7 @@ def add_extension(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cette extension a été ajoutée") messages.success(request, "Cette extension a été ajoutée")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'extensionform': extension}, 'machines/machine.html', request) return form({'extensionform': extension, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Extension) @can_edit(Extension)
@ -541,7 +553,7 @@ def edit_extension(request, extension_instance, extensionid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in extension.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in extension.changed_data))
messages.success(request, "Extension modifiée") messages.success(request, "Extension modifiée")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'extensionform': extension}, 'machines/machine.html', request) return form({'extensionform': extension, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Extension) @can_delete_set(Extension)
@ -558,7 +570,7 @@ def del_extension(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "L'extension %s est affectée à au moins un type de machine, vous ne pouvez pas la supprimer" % extension_del) messages.error(request, "L'extension %s est affectée à au moins un type de machine, vous ne pouvez pas la supprimer" % extension_del)
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'extensionform': extension}, 'machines/machine.html', request) return form({'extensionform': extension, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(SOA) @can_create(SOA)
@ -572,7 +584,7 @@ def add_soa(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement SOA a été ajouté") messages.success(request, "Cet enregistrement SOA a été ajouté")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'soaform': soa}, 'machines/machine.html', request) return form({'soaform': soa, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(SOA) @can_edit(SOA)
@ -586,7 +598,7 @@ def edit_soa(request, soa_instance, soaid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in soa.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in soa.changed_data))
messages.success(request, "SOA modifié") messages.success(request, "SOA modifié")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'soaform': soa}, 'machines/machine.html', request) return form({'soaform': soa, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(SOA) @can_delete_set(SOA)
@ -603,7 +615,7 @@ def del_soa(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le SOA suivant %s ne peut être supprimé" % soa_del) messages.error(request, "Erreur le SOA suivant %s ne peut être supprimé" % soa_del)
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'soaform': soa}, 'machines/machine.html', request) return form({'soaform': soa, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Mx) @can_create(Mx)
@ -617,7 +629,7 @@ def add_mx(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement mx a été ajouté") messages.success(request, "Cet enregistrement mx a été ajouté")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'mxform': mx}, 'machines/machine.html', request) return form({'mxform': mx, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Mx) @can_edit(Mx)
@ -631,7 +643,7 @@ def edit_mx(request, mx_instance, mxid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in mx.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in mx.changed_data))
messages.success(request, "Mx modifié") messages.success(request, "Mx modifié")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'mxform': mx}, 'machines/machine.html', request) return form({'mxform': mx, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Mx) @can_delete_set(Mx)
@ -648,7 +660,7 @@ def del_mx(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le Mx suivant %s ne peut être supprimé" % mx_del) messages.error(request, "Erreur le Mx suivant %s ne peut être supprimé" % mx_del)
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'mxform': mx}, 'machines/machine.html', request) return form({'mxform': mx, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Ns) @can_create(Ns)
@ -662,7 +674,7 @@ def add_ns(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement ns a été ajouté") messages.success(request, "Cet enregistrement ns a été ajouté")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'nsform': ns}, 'machines/machine.html', request) return form({'nsform': ns, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Ns) @can_edit(Ns)
@ -676,7 +688,7 @@ def edit_ns(request, ns_instance, nsid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in ns.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in ns.changed_data))
messages.success(request, "Ns modifié") messages.success(request, "Ns modifié")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'nsform': ns}, 'machines/machine.html', request) return form({'nsform': ns, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Ns) @can_delete_set(Ns)
@ -693,7 +705,7 @@ def del_ns(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le Ns suivant %s ne peut être supprimé" % ns_del) messages.error(request, "Erreur le Ns suivant %s ne peut être supprimé" % ns_del)
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'nsform': ns}, 'machines/machine.html', request) return form({'nsform': ns, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Txt) @can_create(Txt)
@ -707,7 +719,7 @@ def add_txt(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement text a été ajouté") messages.success(request, "Cet enregistrement text a été ajouté")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'txtform': txt}, 'machines/machine.html', request) return form({'txtform': txt, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Txt) @can_edit(Txt)
@ -721,7 +733,7 @@ def edit_txt(request, txt_instance, txtid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in txt.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in txt.changed_data))
messages.success(request, "Txt modifié") messages.success(request, "Txt modifié")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'txtform': txt}, 'machines/machine.html', request) return form({'txtform': txt, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Txt) @can_delete_set(Txt)
@ -738,7 +750,7 @@ def del_txt(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le Txt suivant %s ne peut être supprimé" % txt_del) messages.error(request, "Erreur le Txt suivant %s ne peut être supprimé" % txt_del)
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'txtform': txt}, 'machines/machine.html', request) return form({'txtform': txt, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Srv) @can_create(Srv)
@ -752,7 +764,7 @@ def add_srv(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement srv a été ajouté") messages.success(request, "Cet enregistrement srv a été ajouté")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'srvform': srv}, 'machines/machine.html', request) return form({'srvform': srv, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Srv) @can_edit(Srv)
@ -766,7 +778,7 @@ def edit_srv(request, srv_instance, srvid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in srv.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in srv.changed_data))
messages.success(request, "Srv modifié") messages.success(request, "Srv modifié")
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'srvform': srv}, 'machines/machine.html', request) return form({'srvform': srv, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Srv) @can_delete_set(Srv)
@ -783,7 +795,7 @@ def del_srv(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le Srv suivant %s ne peut être supprimé" % srv_del) messages.error(request, "Erreur le Srv suivant %s ne peut être supprimé" % srv_del)
return redirect(reverse('machines:index-extension')) return redirect(reverse('machines:index-extension'))
return form({'srvform': srv}, 'machines/machine.html', request) return form({'srvform': srv, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Domain) @can_create(Domain)
@ -803,7 +815,7 @@ def add_alias(request, interface, interfaceid):
'machines:index-alias', 'machines:index-alias',
kwargs={'interfaceid':str(interfaceid)} kwargs={'interfaceid':str(interfaceid)}
)) ))
return form({'aliasform': alias}, 'machines/machine.html', request) return form({'aliasform': alias, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Domain) @can_edit(Domain)
@ -820,7 +832,7 @@ def edit_alias(request, domain_instance, domainid):
'machines:index-alias', 'machines:index-alias',
kwargs={'interfaceid':str(domain_instance.cname.interface_parent.id)} kwargs={'interfaceid':str(domain_instance.cname.interface_parent.id)}
)) ))
return form({'aliasform': alias}, 'machines/machine.html', request) return form({'aliasform': alias, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Interface) @can_edit(Interface)
@ -840,7 +852,7 @@ def del_alias(request, interface, interfaceid):
'machines:index-alias', 'machines:index-alias',
kwargs={'interfaceid':str(interfaceid)} kwargs={'interfaceid':str(interfaceid)}
)) ))
return form({'aliasform': alias}, 'machines/machine.html', request) return form({'aliasform': alias, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@ -855,7 +867,7 @@ def add_service(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement service a été ajouté") messages.success(request, "Cet enregistrement service a été ajouté")
return redirect(reverse('machines:index-service')) return redirect(reverse('machines:index-service'))
return form({'serviceform': service}, 'machines/machine.html', request) return form({'serviceform': service, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Service) @can_edit(Service)
@ -869,7 +881,7 @@ def edit_service(request, service_instance, serviceid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in service.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in service.changed_data))
messages.success(request, "Service modifié") messages.success(request, "Service modifié")
return redirect(reverse('machines:index-service')) return redirect(reverse('machines:index-service'))
return form({'serviceform': service}, 'machines/machine.html', request) return form({'serviceform': service, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Service) @can_delete_set(Service)
@ -886,7 +898,7 @@ def del_service(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le service suivant %s ne peut être supprimé" % service_del) messages.error(request, "Erreur le service suivant %s ne peut être supprimé" % service_del)
return redirect(reverse('machines:index-service')) return redirect(reverse('machines:index-service'))
return form({'serviceform': service}, 'machines/machine.html', request) return form({'serviceform': service, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Vlan) @can_create(Vlan)
@ -900,7 +912,7 @@ def add_vlan(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement vlan a été ajouté") messages.success(request, "Cet enregistrement vlan a été ajouté")
return redirect(reverse('machines:index-vlan')) return redirect(reverse('machines:index-vlan'))
return form({'vlanform': vlan}, 'machines/machine.html', request) return form({'vlanform': vlan, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Vlan) @can_edit(Vlan)
@ -914,7 +926,7 @@ def edit_vlan(request, vlan_instance, vlanid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in vlan.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in vlan.changed_data))
messages.success(request, "Vlan modifié") messages.success(request, "Vlan modifié")
return redirect(reverse('machines:index-vlan')) return redirect(reverse('machines:index-vlan'))
return form({'vlanform': vlan}, 'machines/machine.html', request) return form({'vlanform': vlan, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Vlan) @can_delete_set(Vlan)
@ -931,7 +943,7 @@ def del_vlan(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le Vlan suivant %s ne peut être supprimé" % vlan_del) messages.error(request, "Erreur le Vlan suivant %s ne peut être supprimé" % vlan_del)
return redirect(reverse('machines:index-vlan')) return redirect(reverse('machines:index-vlan'))
return form({'vlanform': vlan}, 'machines/machine.html', request) return form({'vlanform': vlan, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(Nas) @can_create(Nas)
@ -945,7 +957,7 @@ def add_nas(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Cet enregistrement nas a été ajouté") messages.success(request, "Cet enregistrement nas a été ajouté")
return redirect(reverse('machines:index-nas')) return redirect(reverse('machines:index-nas'))
return form({'nasform': nas}, 'machines/machine.html', request) return form({'nasform': nas, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_edit(Nas) @can_edit(Nas)
@ -959,7 +971,7 @@ def edit_nas(request, nas_instance, nasid):
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in nas.changed_data)) reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in nas.changed_data))
messages.success(request, "Nas modifié") messages.success(request, "Nas modifié")
return redirect(reverse('machines:index-nas')) return redirect(reverse('machines:index-nas'))
return form({'nasform': nas}, 'machines/machine.html', request) return form({'nasform': nas, 'action_name' : 'Editer'}, 'machines/machine.html', request)
@login_required @login_required
@can_delete_set(Nas) @can_delete_set(Nas)
@ -976,7 +988,7 @@ def del_nas(request, instances):
except ProtectedError: except ProtectedError:
messages.error(request, "Erreur le Nas suivant %s ne peut être supprimé" % nas_del) messages.error(request, "Erreur le Nas suivant %s ne peut être supprimé" % nas_del)
return redirect(reverse('machines:index-nas')) return redirect(reverse('machines:index-nas'))
return form({'nasform': nas}, 'machines/machine.html', request) return form({'nasform': nas, 'action_name' : 'Supprimer'}, 'machines/machine.html', request)
@login_required @login_required
@can_view_all(Machine) @can_view_all(Machine)
@ -1130,7 +1142,7 @@ def add_portlist(request):
port_list.save() port_list.save()
messages.success(request, "Liste de ports créée") messages.success(request, "Liste de ports créée")
return redirect(reverse('machines:index-portlist')) return redirect(reverse('machines:index-portlist'))
return form({'machineform' : port_list}, 'machines/machine.html', request) return form({'machineform' : port_list, 'action_name' : 'Créer'}, 'machines/machine.html', request)
@login_required @login_required
@can_create(OuverturePort) @can_create(OuverturePort)
@ -1143,7 +1155,7 @@ def configure_ports(request, interface_instance, interfaceid):
interface.save() interface.save()
messages.success(request, "Configuration des ports mise à jour.") messages.success(request, "Configuration des ports mise à jour.")
return redirect(reverse('machines:index')) return redirect(reverse('machines:index'))
return form({'interfaceform' : interface}, 'machines/machine.html', request) return form({'interfaceform' : interface, 'action_name' : 'Editer la configuration'}, 'machines/machine.html', request)
""" Framework Rest """ """ Framework Rest """

2
users/templates/users/user.html
View File

@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<form class="form" method="post"> <form class="form" method="post">
{% csrf_token %} {% csrf_token %}
{% massive_bootstrap_form userform 'room,school,administrators,members' %} {% massive_bootstrap_form userform 'room,school,administrators,members' %}
{% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %} {% bootstrap_button action_name button_type="submit" icon="star" %}
</form> </form>
<br> <br>
{% if showCGU %} {% if showCGU %}

44
users/views.py
View File

@ -122,7 +122,7 @@ def new_user(request):
'users:profil', 'users:profil',
kwargs={'userid':str(user.id)} kwargs={'userid':str(user.id)}
)) ))
return form({'userform': user,'GTU_sum_up':GTU_sum_up,'GTU':GTU,'showCGU':True}, 'users/user.html', request) return form({'userform': user,'GTU_sum_up':GTU_sum_up,'GTU':GTU,'showCGU':True, 'action_name':'Créer un utilisateur'}, 'users/user.html', request)
@login_required @login_required
@ -144,7 +144,7 @@ def new_club(request):
'users:profil', 'users:profil',
kwargs={'userid':str(club.id)} kwargs={'userid':str(club.id)}
)) ))
return form({'userform': club, 'showCGU':False}, 'users/user.html', request) return form({'userform': club, 'showCGU':False, 'action_name':'Créer un club'}, 'users/user.html', request)
@login_required @login_required
@ -165,7 +165,7 @@ def edit_club_admin_members(request, club_instance, clubid):
'users:profil', 'users:profil',
kwargs={'userid':str(club_instance.id)} kwargs={'userid':str(club_instance.id)}
)) ))
return form({'userform': club, 'showCGU':False}, 'users/user.html', request) return form({'userform': club, 'showCGU':False, 'action_name':'Editer les admin et membres'}, 'users/user.html', request)
@login_required @login_required
@ -198,7 +198,7 @@ def edit_info(request, user, userid):
'users:profil', 'users:profil',
kwargs={'userid':str(userid)} kwargs={'userid':str(userid)}
)) ))
return form({'userform': user}, 'users/user.html', request) return form({'userform': user, 'action_name': "Editer l'utilisateur"}, 'users/user.html', request)
@login_required @login_required
@ -225,7 +225,7 @@ def state(request, user, userid):
'users:profil', 'users:profil',
kwargs={'userid':str(userid)} kwargs={'userid':str(userid)}
)) ))
return form({'userform': state}, 'users/user.html', request) return form({'userform': state, 'action_name': "Editer l'état"}, 'users/user.html', request)
@login_required @login_required
@ -244,7 +244,7 @@ def groups(request, user, userid):
'users:profil', 'users:profil',
kwargs={'userid':str(userid)} kwargs={'userid':str(userid)}
)) ))
return form({'userform': group}, 'users/user.html', request) return form({'userform': group, 'action_name':'Editer les groupes'}, 'users/user.html', request)
@login_required @login_required
@ -264,7 +264,7 @@ def password(request, user, userid):
'users:profil', 'users:profil',
kwargs={'userid':str(user.id)} kwargs={'userid':str(user.id)}
)) ))
return form({'userform': u_form}, 'users/user.html', request) return form({'userform': u_form, 'action_name':'Changer le mot de passe'}, 'users/user.html', request)
@login_required @login_required
@ -294,7 +294,7 @@ def new_serviceuser(request):
"L'utilisateur %s a été crée" % user_object.pseudo "L'utilisateur %s a été crée" % user_object.pseudo
) )
return redirect(reverse('users:index-serviceusers')) return redirect(reverse('users:index-serviceusers'))
return form({'userform': user}, 'users/user.html', request) return form({'userform': user, 'action_name':'Créer un serviceuser'}, 'users/user.html', request)
@login_required @login_required
@ -314,7 +314,7 @@ def edit_serviceuser(request, user, userid):
)) ))
messages.success(request, "L'user a bien été modifié") messages.success(request, "L'user a bien été modifié")
return redirect(reverse('users:index-serviceusers')) return redirect(reverse('users:index-serviceusers'))
return form({'userform': user}, 'users/user.html', request) return form({'userform': user, 'action_name':'Editer un serviceuser'}, 'users/user.html', request)
@login_required @login_required
@ -358,7 +358,7 @@ def add_ban(request, user, userid):
request, request,
"Attention, cet utilisateur a deja un bannissement actif" "Attention, cet utilisateur a deja un bannissement actif"
) )
return form({'userform': ban}, 'users/user.html', request) return form({'userform': ban, 'action_name': 'Ajouter un ban'}, 'users/user.html', request)
@login_required @login_required
@can_edit(Ban) @can_edit(Ban)
@ -376,7 +376,7 @@ def edit_ban(request, ban_instance, banid):
)) ))
messages.success(request, "Bannissement modifié") messages.success(request, "Bannissement modifié")
return redirect(reverse('users:index')) return redirect(reverse('users:index'))
return form({'userform': ban}, 'users/user.html', request) return form({'userform': ban, 'action_name': 'Editer un ban'}, 'users/user.html', request)
@login_required @login_required
@ -407,7 +407,7 @@ def add_whitelist(request, user, userid):
request, request,
"Attention, cet utilisateur a deja un accès gracieux actif" "Attention, cet utilisateur a deja un accès gracieux actif"
) )
return form({'userform': whitelist}, 'users/user.html', request) return form({'userform': whitelist, 'action_name': 'Ajouter une whitelist'}, 'users/user.html', request)
@login_required @login_required
@ -430,7 +430,7 @@ def edit_whitelist(request, whitelist_instance, whitelistid):
)) ))
messages.success(request, "Whitelist modifiée") messages.success(request, "Whitelist modifiée")
return redirect(reverse('users:index')) return redirect(reverse('users:index'))
return form({'userform': whitelist}, 'users/user.html', request) return form({'userform': whitelist, 'action_name': 'Editer une whitelist'}, 'users/user.html', request)
@login_required @login_required
@ -446,7 +446,7 @@ def add_school(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "L'établissement a été ajouté") messages.success(request, "L'établissement a été ajouté")
return redirect(reverse('users:index-school')) return redirect(reverse('users:index-school'))
return form({'userform': school}, 'users/user.html', request) return form({'userform': school, 'action_name':'Ajouter'}, 'users/user.html', request)
@login_required @login_required
@ -464,7 +464,7 @@ def edit_school(request, school_instance, schoolid):
)) ))
messages.success(request, "Établissement modifié") messages.success(request, "Établissement modifié")
return redirect(reverse('users:index-school')) return redirect(reverse('users:index-school'))
return form({'userform': school}, 'users/user.html', request) return form({'userform': school, 'action_name':'Editer'}, 'users/user.html', request)
@login_required @login_required
@ -489,7 +489,7 @@ def del_school(request, instances):
"L'établissement %s est affecté à au moins un user, \ "L'établissement %s est affecté à au moins un user, \
vous ne pouvez pas le supprimer" % school_del) vous ne pouvez pas le supprimer" % school_del)
return redirect(reverse('users:index-school')) return redirect(reverse('users:index-school'))
return form({'userform': school}, 'users/user.html', request) return form({'userform': school, 'action_name': 'Supprimer'}, 'users/user.html', request)
@login_required @login_required
@ -505,7 +505,7 @@ def add_listright(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Le droit/groupe a été ajouté") messages.success(request, "Le droit/groupe a été ajouté")
return redirect(reverse('users:index-listright')) return redirect(reverse('users:index-listright'))
return form({'userform': listright}, 'users/user.html', request) return form({'userform': listright, 'action_name': 'Ajouter'}, 'users/user.html', request)
@login_required @login_required
@ -526,7 +526,7 @@ def edit_listright(request, listright_instance, listrightid):
)) ))
messages.success(request, "Droit modifié") messages.success(request, "Droit modifié")
return redirect(reverse('users:index-listright')) return redirect(reverse('users:index-listright'))
return form({'userform': listright}, 'users/user.html', request) return form({'userform': listright, 'action_name': 'Editer'}, 'users/user.html', request)
@login_required @login_required
@ -549,7 +549,7 @@ def del_listright(request, instances):
"Le groupe %s est affecté à au moins un user, \ "Le groupe %s est affecté à au moins un user, \
vous ne pouvez pas le supprimer" % listright_del) vous ne pouvez pas le supprimer" % listright_del)
return redirect(reverse('users:index-listright')) return redirect(reverse('users:index-listright'))
return form({'userform': listright}, 'users/user.html', request) return form({'userform': listright, 'action_name': 'Supprimer'}, 'users/user.html', request)
@login_required @login_required
@ -797,12 +797,12 @@ def reset_password(request):
) )
except User.DoesNotExist: except User.DoesNotExist:
messages.error(request, "Cet utilisateur n'existe pas") messages.error(request, "Cet utilisateur n'existe pas")
return form({'userform': userform}, 'users/user.html', request) return form({'userform': userform, 'action_name': 'Réinitialiser'}, 'users/user.html', request)
user.reset_passwd_mail(request) user.reset_passwd_mail(request)
messages.success(request, "Un mail pour l'initialisation du mot\ messages.success(request, "Un mail pour l'initialisation du mot\
de passe a été envoyé") de passe a été envoyé")
redirect(reverse('index')) redirect(reverse('index'))
return form({'userform': userform}, 'users/user.html', request) return form({'userform': userform, 'action_name': 'Réinitialiser'}, 'users/user.html', request)
def process(request, token): def process(request, token):
@ -829,7 +829,7 @@ def process_passwd(request, req):
req.delete() req.delete()
messages.success(request, "Le mot de passe a changé") messages.success(request, "Le mot de passe a changé")
return redirect(reverse('index')) return redirect(reverse('index'))
return form({'userform': u_form}, 'users/user.html', request) return form({'userform': u_form, 'action_name': 'Changer le mot de passe'}, 'users/user.html', request)
class JSONResponse(HttpResponse): class JSONResponse(HttpResponse):

Write Preview
Loading…
Cancel
Save