From 6b43e68ababc6427579bcd89f078753b4d7b87d6 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Sun, 19 Aug 2018 21:26:10 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Compatibilit=C3=A9=20Python=202=20dans=20co?= =?UTF-8?q?tisations/tex.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cotisations/tex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cotisations/tex.py b/cotisations/tex.py index a7617114..0ee45bdb 100644 --- a/cotisations/tex.py +++ b/cotisations/tex.py @@ -1,4 +1,4 @@ -#-*- coding: utf-8 -*- +# coding: utf-8 # Re2o est un logiciel d'administration développé initiallement au rezometz. Il # se veut agnostique au réseau considéré, de manière à être installable en # quelques clics. From 01de1e9166a7f3df3cef251292afc8b10f354392 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Sun, 19 Aug 2018 21:40:46 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Erreur=20dans=20les=20pr=C3=A9f=C3=A9rences?= =?UTF-8?q?=20association?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- preferences/forms.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/preferences/forms.py b/preferences/forms.py index 73731750..b9ccd531 100644 --- a/preferences/forms.py +++ b/preferences/forms.py @@ -168,9 +168,6 @@ class EditAssoOptionForm(ModelForm): self.fields['pseudo'].label = _("Usual name") self.fields['utilisateur_asso'].label = _("Account used for editing" " from /admin") - self.fields['payment'].label = _("Payment") - self.fields['payment_id'].label = _("Payment ID") - self.fields['payment_pass'].label = _("Payment password") self.fields['description'].label = _("Description") From dbe27699936ea692c92c6c1f50551afe1e5299a2 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Sun, 19 Aug 2018 21:42:49 +0200 Subject: [PATCH 3/6] Fix graphique sur les boutons historiques des listes de factures --- cotisations/templates/cotisations/aff_cotisations.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index b7fe993b..30de85dc 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% can_delete facture %} {% include 'buttons/suppr.html' with href='cotisations:del-facture' id=facture.id %} {% acl_end %} - {% history_button facture text=True html_class=False %} + {% history_button facture %} {% if facture.valid %} From 8bfef4716a1c3b8ebb0be34946a0c38ee7914fdd Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Tue, 21 Aug 2018 20:43:12 +0200 Subject: [PATCH 4/6] Fix erreur de default dans l'affichage des noms de machines. --- machines/templates/machines/aff_machines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html index e3404036..33ae617a 100644 --- a/machines/templates/machines/aff_machines.html +++ b/machines/templates/machines/aff_machines.html @@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% trans "No name" as tr_no_name %} {% trans "View the profile" as tr_view_the_profile %} - {{ machine.name|default:'tr_no_name' }} + {{ machine.name|default:tr_no_name }} {{ machine.user }} From c25a498140ab7e7dcfaf3b1d732809ddf219f071 Mon Sep 17 00:00:00 2001 From: Laouen Fernet Date: Mon, 20 Aug 2018 11:46:09 +0200 Subject: [PATCH 5/6] fix the display of the end of connection date --- users/templates/users/profil.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 0f4f8b2c..b898e21f 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% elif not users.has_access %}
{% trans "No connection" %}
-
+
{% can_create Facture %} {% trans "Pay for a connection" %} From 824fd0c51eac71819271accfd323384b0d0a365f Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 7 Feb 2019 15:17:11 +0100 Subject: [PATCH 6/6] Fix : All message in asci... --- freeradius_utils/auth.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/freeradius_utils/auth.py b/freeradius_utils/auth.py index 40cea408..54364dc1 100644 --- a/freeradius_utils/auth.py +++ b/freeradius_utils/auth.py @@ -191,12 +191,12 @@ def post_auth(data): nas_instance = find_nas_from_request(nas) # Toutes les reuquètes non proxifiées if not nas_instance: - logger.info(u"Requète proxifiée, nas inconnu".encode('utf-8')) + logger.info(u"Requete proxifiee, nas inconnu".encode('utf-8')) return radiusd.RLM_MODULE_OK nas_type = Nas.objects.filter(nas_type=nas_instance.type).first() if not nas_type: logger.info( - u"Type de nas non enregistré dans la bdd!".encode('utf-8') + u"Type de nas non enregistre dans la bdd!".encode('utf-8') ) return radiusd.RLM_MODULE_OK @@ -295,15 +295,15 @@ def check_user_machine_and_register(nas_type, username, mac_address): if not user: return (False, u"User inconnu", '') if not user.has_access(): - return (False, u"Adhérent non cotisant", '') + return (False, u"Adherent non cotisant", '') if interface: if interface.machine.user != user: return (False, - u"Machine enregistrée sur le compte d'un autre " + u"Machine enregistree sur le compte d'un autre " "user...", '') elif not interface.is_active: - return (False, u"Machine desactivée", '') + return (False, u"Machine desactivee", '') elif not interface.ipv4: interface.assign_ipv4() return (True, u"Ok, Reassignation de l'ipv4", user.pwd_ntlm) @@ -404,7 +404,7 @@ def decide_vlan_switch(nas_machine, nas_type, port_number, # Si le port est désactivé, on rejette la connexion if not port.state: - return (sw_name, port.room, u'Port desactivé', None, False) + return (sw_name, port.room, u'Port desactive', None, False) # Si radius est désactivé, on laisse passer if port_profile.radius_type == 'NO': @@ -460,7 +460,7 @@ def decide_vlan_switch(nas_machine, nas_type, port_number, return ( sw_name, room, - u'Utilisateur banni ou désactivé -> Web redirect', + u'Utilisateur banni ou desactive -> Web redirect', None, False )