.gitignore

-settings_local.py
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
 *.swp
-*.pyc
+
+# Translations
+#*.mo TODO
+*.pot
+
+# Django stuff
+*.log
+local_settings.py
+db.sqlite3
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# PyCharm project settings
+.idea/
+
+# Django statics
+static_files/
+static/logo/
+
+# re2o specific
+settings_local.py
 re2o.png
-__pycache__/*
-static_files/*
-static/logo/*
-media/*
+media/

CHANGELOG.md

@@ -150,3 +150,17 @@ On some database engines (postgreSQL) you also need to update the id sequences:
 ```bash
 python3 manage.py sqlsequencereset cotisations | python3 manage.py dbshell
 ```
+
+## MR 296: Frontend changes
+
+Install fonts-font-awesome
+
+```bash
+apt-get -y install fonts-font-awesome
+```
+
+Collec new statics
+
+```bash
+python3 manage.py collectstatic
+```

README.md

 # Re2o
 
-Gnu public license v2.0
+GNU public license v2.0
 
 ## Avant propos 
 
-Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+Re2o est un logiciel d'administration développé initialement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en 
 quelques clics.
 
@@ -31,15 +31,15 @@ Pour cela :
 
 ## Fonctionnement général
 
-Re2o est séparé entre les models, qui sont visible sur le schéma des 
-dépendances. Il s'agit en réalité des tables sql, et les fields etant les 
+Re2o est séparé entre les models, qui sont visibles sur le schéma des
+dépendances. Il s'agit en réalité des tables sql, et les fields étant les
 colonnes.
 Ceci dit il n'est jamais nécessaire de toucher directement au sql, django 
 procédant automatiquement à tout cela. 
 On crée donc différents models (user, right pour les droits des users, 
 interfaces, IpList pour l'ensemble des adresses ip, etc)
 
-Du coté des forms, il s'agit des formulaire d'édition des models. Il 
+Du coté des forms, il s'agit des formulaires d'édition des models. Il
 s'agit de ModelForms django, qui héritent des models très simplement, voir la 
 documentation django models forms.
 
@@ -56,12 +56,20 @@ d'accéder à ces vues, utilisé par re2o-tools.
 
 # Requète en base de donnée
 
-Pour avoir un shell, il suffit de lancer '''python3 manage.py shell'''
-Pour charger des objets, example avec User, faire : 
-''' from users.models import User'''
-Pour charger les objets django, il suffit de faire User.objects.all() 
-pour tous les users par exemple. 
-Il est ensuite aisé de faire des requètes, par exemple 
-User.objects.filter(pseudo='test')
-Des exemples et la documentation complète sur les requètes django sont 
+Pour avoir un shell, lancer :
+```.bash
+python3 manage.py shell
+```
+
+Pour charger des objets (exemple avec User), faire :
+```.python
+from users.models import User
+```
+
+Pour charger les objets django, il suffit de faire `User.objects.all()`
+pour tous les users par exemple.
+Il est ensuite aisé de faire des requêtes, par exemple
+`User.objects.filter(pseudo='test')`
+
+Des exemples et la documentation complète sur les requêtes django sont
 disponible sur le site officiel.

api/serializers.py

@@ -153,7 +153,8 @@ class VlanSerializer(NamespacedHMSerializer):
     """
     class Meta:
         model = machines.Vlan
-        fields = ('vlan_id', 'name', 'comment', 'api_url')
+        fields = ('vlan_id', 'name', 'comment', 'arp_protect', 'dhcp_snooping',
+                  'dhcpv6_snooping', 'igmp', 'mld', 'api_url')
 
 
 class NasSerializer(NamespacedHMSerializer):
@@ -310,6 +311,16 @@ class OuverturePortSerializer(NamespacedHMSerializer):
         fields = ('begin', 'end', 'port_list', 'protocole', 'io', 'api_url')
 
 
+class RoleSerializer(NamespacedHMSerializer):
+    """Serialize `machines.models.OuverturePort` objects.
+    """
+    servers = InterfaceSerializer(read_only=True, many=True)
+
+    class Meta:
+        model = machines.Role
+        fields = ('role_type', 'servers', 'api_url')
+
+
 # PREFERENCES
 
 
@@ -338,11 +349,15 @@ class OptionalMachineSerializer(NamespacedHMSerializer):
 class OptionalTopologieSerializer(NamespacedHMSerializer):
     """Serialize `preferences.models.OptionalTopologie` objects.
     """
+    switchs_management_interface_ip = serializers.CharField()
 
     class Meta:
         model = preferences.OptionalTopologie
         fields = ('radius_general_policy', 'vlan_decision_ok',
-                  'vlan_decision_nok')
+                  'vlan_decision_nok', 'switchs_ip_type', 'switchs_web_management',
+                  'switchs_web_management_ssl', 'switchs_rest_management',
+                  'switchs_management_utils', 'switchs_management_interface_ip',
+                  'provision_switchs_enabled', 'switchs_provision', 'switchs_management_sftp_creds')
 
 
 class GeneralOptionSerializer(NamespacedHMSerializer):
@@ -467,16 +482,30 @@ class BuildingSerializer(NamespacedHMSerializer):
 class SwitchPortSerializer(NamespacedHMSerializer):
     """Serialize `topologie.models.Port` objects
     """
+
+    get_port_profil = NamespacedHIField(view_name='portprofile-detail', read_only=True)
+
     class Meta:
         model = topologie.Port
         fields = ('switch', 'port', 'room', 'machine_interface', 'related',
-                  'custom_profile', 'state', 'details', 'api_url')
+                  'custom_profile', 'state', 'get_port_profil', 'details', 'api_url')
         extra_kwargs = {
             'related': {'view_name': 'switchport-detail'},
             'api_url': {'view_name': 'switchport-detail'},
         }
 
 
+class PortProfileSerializer(NamespacedHMSerializer):
+    """Serialize `topologie.models.Room` objects
+    """
+    class Meta:
+        model = topologie.PortProfile
+        fields = ('name', 'profil_default', 'vlan_untagged', 'vlan_tagged', 
+                  'radius_type', 'radius_mode', 'speed', 'mac_limit', 'flow_control',
+                  'dhcp_snooping', 'dhcpv6_snooping', 'dhcpv6_snooping', 'arp_protect',
+                  'ra_guard', 'loop_protect', 'api_url')
+
+
 class RoomSerializer(NamespacedHMSerializer):
     """Serialize `topologie.models.Room` objects
     """
@@ -644,6 +673,89 @@ class ServiceRegenSerializer(NamespacedHMSerializer):
             'api_url': {'view_name': 'serviceregen-detail'}
         }
 
+# Switches et ports
+
+class InterfaceVlanSerializer(NamespacedHMSerializer):
+    domain = serializers.CharField(read_only=True)
+    ipv4 = serializers.CharField(read_only=True)
+    ipv6 = Ipv6ListSerializer(read_only=True, many=True)
+    vlan_id = serializers.IntegerField(source='type.ip_type.vlan.vlan_id', read_only=True)
+
+    class Meta:
+        model = machines.Interface
+        fields = ('ipv4', 'ipv6', 'domain', 'vlan_id')
+
+class InterfaceRoleSerializer(NamespacedHMSerializer):
+    interface = InterfaceVlanSerializer(source='machine.interface_set', read_only=True, many=True)
+
+    class Meta:
+        model = machines.Interface
+        fields = ('interface',)
+
+
+class RoleSerializer(NamespacedHMSerializer):
+    """Serialize `machines.models.OuverturePort` objects.
+    """
+    servers = InterfaceRoleSerializer(read_only=True, many=True)
+
+    class Meta:
+        model = machines.Role
+        fields = ('role_type', 'servers', 'specific_role')
+
+
+class VlanPortSerializer(NamespacedHMSerializer):
+    class Meta:
+        model = machines.Vlan
+        fields = ('vlan_id', 'name') 
+
+
+class ProfilSerializer(NamespacedHMSerializer):
+    vlan_untagged = VlanSerializer(read_only=True)
+    vlan_tagged = VlanPortSerializer(read_only=True, many=True)
+
+    class Meta:
+        model = topologie.PortProfile
+        fields = ('name', 'profil_default', 'vlan_untagged', 'vlan_tagged', 'radius_type', 'radius_mode', 'speed', 'mac_limit', 'flow_control', 'dhcp_snooping', 'dhcpv6_snooping', 'arp_protect', 'ra_guard', 'loop_protect', 'vlan_untagged', 'vlan_tagged')
+
+
+class ModelSwitchSerializer(NamespacedHMSerializer):
+    constructor = serializers.CharField(read_only=True)
+
+    class Meta:
+        model = topologie.ModelSwitch
+        fields = ('reference', 'firmware', 'constructor')
+
+
+class SwitchBaySerializer(NamespacedHMSerializer):
+    class Meta:
+        model = topologie.SwitchBay
+        fields = ('name',)
+
+
+class PortsSerializer(NamespacedHMSerializer):
+    """Serialize `machines.models.Ipv6List` objects.
+    """
+    get_port_profil = ProfilSerializer(read_only=True)
+
+
+    class Meta:
+        model = topologie.Port
+        fields = ('state', 'port', 'pretty_name', 'get_port_profil')
+
+
+
+class SwitchPortSerializer(serializers.ModelSerializer):
+    """Serialize the data about the switches"""
+    ports = PortsSerializer(many=True, read_only=True)
+    model = ModelSwitchSerializer(read_only=True)
+    switchbay = SwitchBaySerializer(read_only=True)
+
+
+    class Meta:
+        model = topologie.Switch
+        fields = ('short_name', 'model', 'switchbay', 'ports', 'ipv4', 'ipv6',
+                  'interfaces_subnet', 'interfaces6_subnet', 'automatic_provision', 'rest_enabled',
+                  'web_management_enabled', 'get_radius_key_value', 'get_management_cred_value')
 
 # LOCAL EMAILS
 
@@ -845,6 +957,26 @@ class DNSZonesSerializer(serializers.ModelSerializer):
                   'mx_records', 'txt_records', 'srv_records', 'a_records',
                   'aaaa_records', 'cname_records', 'sshfp_records')
 
+#REMINDER
+
+
+class ReminderUsersSerializer(UserSerializer):
+    """Serialize the data about a mailing member.
+    """
+    class Meta(UserSerializer.Meta):
+        fields = ('get_full_name', 'email')
+
+
+class ReminderSerializer(serializers.ModelSerializer):
+    """
+    Serialize the data about a reminder
+    """
+    users_to_remind = ReminderUsersSerializer(many=True)
+
+    class Meta:
+        model = preferences.Reminder
+        fields = ('days','message','users_to_remind')
+
 
 class DNSReverseZonesSerializer(serializers.ModelSerializer):
     """Serialize the data about DNS Zones.

api/urls.py

@@ -63,6 +63,7 @@ router.register_viewset(r'machines/service', views.ServiceViewSet)
 router.register_viewset(r'machines/servicelink', views.ServiceLinkViewSet, base_name='servicelink')
 router.register_viewset(r'machines/ouvertureportlist', views.OuverturePortListViewSet)
 router.register_viewset(r'machines/ouvertureport', views.OuverturePortViewSet)
+router.register_viewset(r'machines/role', views.RoleViewSet)
 # PREFERENCES
 router.register_view(r'preferences/optionaluser', views.OptionalUserView),
 router.register_view(r'preferences/optionalmachine', views.OptionalMachineView),
@@ -81,7 +82,8 @@ router.register_viewset(r'topologie/modelswitch', views.ModelSwitchViewSet)
 router.register_viewset(r'topologie/constructorswitch', views.ConstructorSwitchViewSet)
 router.register_viewset(r'topologie/switchbay', views.SwitchBayViewSet)
 router.register_viewset(r'topologie/building', views.BuildingViewSet)
-router.register(r'topologie/switchport', views.SwitchPortViewSet, base_name='switchport')
+router.register_viewset(r'topologie/switchport', views.SwitchPortViewSet, base_name='switchport')
+router.register_viewset(r'topologie/portprofile', views.PortProfileViewSet, base_name='portprofile')
 router.register_viewset(r'topologie/room', views.RoomViewSet)
 router.register(r'topologie/portprofile', views.PortProfileViewSet)
 # USERS
@@ -105,6 +107,11 @@ router.register_view(r'localemail/users', views.LocalEmailUsersView),
 # Firewall
 router.register_view(r'firewall/subnet-ports', views.SubnetPortsOpenView),
 router.register_view(r'firewall/interface-ports', views.InterfacePortsOpenView),
+# Switches config
+router.register_view(r'switchs/ports-config', views.SwitchPortView),
+router.register_view(r'switchs/role', views.RoleView),
+# Reminder
+router.register_view(r'reminder/get-users', views.ReminderView),
 # DNS
 router.register_view(r'dns/zones', views.DNSZonesView),
 router.register_view(r'dns/reverse-zones', views.DNSReverseZonesView),

api/views.py

@@ -29,6 +29,7 @@ the response (JSON or other), the CSRF exempting, ...
 import datetime
 
 from django.conf import settings
+from django.db.models import Q
 from rest_framework.authtoken.views import ObtainAuthToken
 from rest_framework.authtoken.models import Token
 from rest_framework.response import Response
@@ -241,6 +242,13 @@ class OuverturePortViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = serializers.OuverturePortSerializer
 
 
+class RoleViewSet(viewsets.ReadOnlyModelViewSet):
+    """Exposes list and details of `machines.models.Machine` objects.
+    """
+    queryset = machines.Role.objects.all()
+    serializer_class = serializers.RoleSerializer
+
+
 # PREFERENCES
 # Those views differ a bit because there is only one object
 # to display, so we don't bother with the listing part
@@ -396,6 +404,13 @@ class SwitchPortViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = serializers.SwitchPortSerializer
 
 
+class PortProfileViewSet(viewsets.ReadOnlyModelViewSet):
+    """Exposes list and details of `topologie.models.PortProfile` objects.
+    """
+    queryset = topologie.PortProfile.objects.all()
+    serializer_class = serializers.PortProfileSerializer
+
+
 class RoomViewSet(viewsets.ReadOnlyModelViewSet):
     """Exposes list and details of `topologie.models.Room` objects.
     """
@@ -421,7 +436,7 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet):
 class HomeCreationViewSet(viewsets.ReadOnlyModelViewSet):
     """Exposes infos of `users.models.Users` objects to create homes.
     """
-    queryset = users.User.objects.all()
+    queryset = users.User.objects.exclude(Q(state=users.User.STATE_DISABLED) | Q(state=users.User.STATE_NOT_YET_ACTIVE))
     serializer_class = serializers.HomeCreationSerializer
 
 class ClubViewSet(viewsets.ReadOnlyModelViewSet):
@@ -514,6 +529,33 @@ class ServiceRegenViewSet(viewsets.ModelViewSet):
             queryset = queryset.filter(server__domain__name__iexact=hostname)
         return queryset
 
+# Config des switches
+
+class SwitchPortView(generics.ListAPIView):
+    """Exposes the associations between hostname, mac address and IPv4 in
+    order to build the DHCP lease files.
+    """
+    queryset = topologie.Switch.objects.all().select_related("switchbay").select_related("model__constructor").prefetch_related("ports__custom_profile__vlan_tagged").prefetch_related("ports__custom_profile__vlan_untagged").prefetch_related("ports__machine_interface__domain__extension").prefetch_related("ports__room")
+
+    serializer_class = serializers.SwitchPortSerializer
+
+# Rappel fin adhésion
+
+class ReminderView(generics.ListAPIView):
+    """Exposes the associations between hostname, mac address and IPv4 in
+    order to build the DHCP lease files.
+    """
+    queryset = preferences.Reminder.objects.all()
+    serializer_class = serializers.ReminderSerializer
+
+
+class RoleView(generics.ListAPIView):
+    """Exposes the associations between hostname, mac address and IPv4 in
+    order to build the DHCP lease files.
+    """
+    queryset = machines.Role.objects.all().prefetch_related('servers')
+    serializer_class = serializers.RoleSerializer
+
 
 # LOCAL EMAILS
 

apt_requirements.txt

@@ -14,4 +14,6 @@ libjs-jquery
 libjs-jquery-ui
 libjs-jquery-timepicker
 libjs-bootstrap
+fonts-font-awesome
 graphviz
+git

cotisations/forms.py

@@ -102,7 +102,7 @@ class SelectArticleForm(FormRevMixin, Form):
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
-        target_user = kwargs.pop('target_user')
+        target_user = kwargs.pop('target_user', None)
         super(SelectArticleForm, self).__init__(*args, **kwargs)
         self.fields['article'].queryset = Article.find_allowed_articles(user, target_user)
 

cotisations/locale/fr/LC_MESSAGES/django.po

@@ -681,8 +681,9 @@ msgstr ""
 
 #: templates/cotisations/delete.html:38
 #: templates/cotisations/edit_facture.html:60
+#: views.py:181 views.py:235
 msgid "Confirm"
-msgstr "Confirmer"
+msgstr "Valider"
 
 #: templates/cotisations/edit_facture.html:31
 #: templates/cotisations/facture.html:30
@@ -695,12 +696,13 @@ msgstr "Modifier la facture"
 
 #: templates/cotisations/edit_facture.html:41
 #: templates/cotisations/facture.html:56
-msgid "Invoice's articles"
-msgstr "Articles de la facture"
+#: templates/cotisations/index_article.html:30
+msgid "Articles"
+msgstr "Articles"
 
 #: templates/cotisations/facture.html:37
-msgid "New invoice"
-msgstr "Nouvelle facture"
+msgid "Buy"
+msgstr "Acheter une cotisation"
 
 #: templates/cotisations/facture.html:40
 #, python-format
@@ -713,8 +715,8 @@ msgid "Current balance: %(balance)s €"
 msgstr "Solde actuel : %(balance)s €"
 
 #: templates/cotisations/facture.html:70
-msgid "Add an article"
-msgstr "Ajouter un article"
+msgid "Add an extra article"
+msgstr "Ajouter un article supplémentaire"
 
 #: templates/cotisations/facture.html:72
 msgid "Total price: <span id=\"total_price\">0,00</span> €"
@@ -728,9 +730,6 @@ msgstr "Factures"
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: templates/cotisations/index_article.html:30
-msgid "Articles"
-msgstr "Articles"
 
 #: templates/cotisations/index_article.html:33
 msgid "Article types list"
@@ -812,9 +811,6 @@ msgstr "Contrôler les factures"
 msgid "You need to choose at least one article."
 msgstr "Vous devez choisir au moins un article."
 
-#: views.py:181 views.py:235
-msgid "Create"
-msgstr "Créer"
 
 #: views.py:228
 msgid "The custom invoice was created."

cotisations/migrations/0032_custom_invoice.py

@@ -30,7 +30,9 @@ def update_rights(apps, schema_editor):
     create_permissions(app)
     app.models_module = False
 
-    former = Permission.objects.get(codename='change_facture_pdf')
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    content_type = ContentType.objects.get_for_model(Permission)
+    former, created = Permission.objects.get_or_create(codename='change_facture_pdf', content_type=content_type)
     new_1 = Permission.objects.get(codename='add_custominvoice')
     new_2 = Permission.objects.get(codename='change_custominvoice')
     new_3 = Permission.objects.get(codename='view_custominvoice')

cotisations/migrations/0034_auto_20180831_1532.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-31 13:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cotisations', '0033_auto_20180818_1319'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='facture',
+            name='valid',
+            field=models.BooleanField(default=False, verbose_name='validated'),
+        ),
+    ]

cotisations/migrations/0035_notepayment.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-09-01 11:27
+from __future__ import unicode_literals
+
+import cotisations.payment_methods.mixins
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cotisations', '0034_auto_20180831_1532'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NotePayment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('server', models.CharField(max_length=255, verbose_name='server')),
+                ('port', models.PositiveIntegerField(blank=True, null=True)),
+                ('id_note', models.PositiveIntegerField(blank=True, null=True)),
+                ('payment', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='payment_method', to='cotisations.Paiement')),
+            ],
+            options={
+                'verbose_name': 'NoteKfet',
+            },
+            bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
+        ),
+    ]

cotisations/models.py

@@ -50,7 +50,7 @@ from machines.models import regen
 from re2o.field_permissions import FieldPermissionModelMixin
 from re2o.mixins import AclMixin, RevMixin
 
-from cotisations.utils import find_payment_method
+from cotisations.utils import find_payment_method, send_mail_invoice
 from cotisations.validators import check_no_balance
 
 
@@ -137,7 +137,7 @@ class Facture(BaseInvoice):
     )
     # TODO : change name to validity for clarity
     valid = models.BooleanField(
-        default=True,
+        default=False,
         verbose_name=_("validated")
     )
     # TODO : changed name to controlled for clarity
@@ -231,19 +231,26 @@ class Facture(BaseInvoice):
         self.field_permissions = {
             'control': self.can_change_control,
         }
+        self.__original_valid = self.valid
+
+    def save(self, *args, **kwargs):
+        super(Facture, self).save(*args, **kwargs)
+        if not self.__original_valid and self.valid:
+            send_mail_invoice(self)
 
     def __str__(self):
         return str(self.user) + ' ' + str(self.date)
 
-
 @receiver(post_save, sender=Facture)
 def facture_post_save(**kwargs):
     """
     Synchronise the LDAP user after an invoice has been saved.
     """
     facture = kwargs['instance']
-    user = facture.user
-    user.ldap_sync(base=False, access_refresh=True, mac_refresh=False)
+    if facture.valid:
+        user = facture.user
+        user.set_active()
+        user.ldap_sync(base=False, access_refresh=True, mac_refresh=False)
 
 
 @receiver(post_delete, sender=Facture)
@@ -472,7 +479,8 @@ def vente_post_save(**kwargs):
         purchase.create_cotis()
         purchase.cotisation.save()
         user = purchase.facture.user
-        user.ldap_sync(base=False, access_refresh=True, mac_refresh=False)
+        user.set_active()
+        user.ldap_sync(base=True, access_refresh=True, mac_refresh=False)
 
 
 # TODO : change vente to purchase
@@ -602,7 +610,9 @@ class Article(RevMixin, AclMixin, models.Model):
             user: The user requesting articles.
             target_user: The user to sell articles
         """
-        if target_user.is_class_club:
+        if target_user is None:
+            objects_pool = cls.objects.filter(Q(type_user='All'))
+        elif target_user.is_class_club:
             objects_pool = cls.objects.filter(
                 Q(type_user='All') | Q(type_user='Club')
             )
@@ -700,6 +710,10 @@ class Paiement(RevMixin, AclMixin, models.Model):
         if payment_method is not None and use_payment_method:
             return payment_method.end_payment(invoice, request)
 
+        ## So make this invoice valid, trigger send mail
+        invoice.valid = True
+        invoice.save()
+
         # In case a cotisation was bought, inform the user, the
         # cotisation time has been extended too
         if any(sell.type_cotisation for sell in invoice.vente_set.all()):

cotisations/payment_methods/__init__.py

@@ -127,10 +127,11 @@ method to your model, where `form` is an instance of
 """
 
 
-from . import comnpay, cheque, balance, urls
+from . import comnpay, cheque, balance, note_kfet, urls
 
 PAYMENT_METHODS = [
     comnpay,
     cheque,
     balance,
+    note_kfet
 ]

cotisations/payment_methods/balance/models.py

@@ -74,8 +74,6 @@ class BalancePayment(PaymentMethodMixin, models.Model):
         user = invoice.user
         total_price = invoice.prix_total()
         if float(user.solde) - float(total_price) < self.minimum_balance:
-            invoice.valid = False
-            invoice.save()
             messages.error(
                 request,
                 _("Your balance is too low for this operation.")

cotisations/payment_methods/cheque/models.py

@@ -46,8 +46,6 @@ class ChequePayment(PaymentMethodMixin, models.Model):
         """Invalidates the invoice then redirect the user towards a view asking
         for informations to add to the invoice before validating it.
         """
-        invoice.valid = False
-        invoice.save()
         return redirect(reverse(
             'cotisations:cheque:validate',
             kwargs={'invoice_pk': invoice.pk}

cotisations/payment_methods/comnpay/models.py

@@ -81,8 +81,6 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
         a facture id, the price and the secret transaction data stored in
         the preferences.
         """
-        invoice.valid = False
-        invoice.save()
         host = request.get_host()
         p = Transaction(
             str(self.payment_credential),

cotisations/payment_methods/comnpay/views.py

@@ -68,7 +68,7 @@ def accept_payment(request, factureid):
             )
     return redirect(reverse(
         'users:profil',
-        kwargs={'userid': request.user.id}
+        kwargs={'userid': invoice.user.id}
     ))
 
 

cotisations/payment_methods/note_kfet/__init__.py

+# -*- mode: python; 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.
+#
+# Copyright © 2018  Gabriel Detraz, Pierre-Antoine Comby
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+"""
+This module contains a method to pay online using comnpay.
+"""
+from . import models, urls
+NAME = "NOTE"
+PaymentMethod = models.NotePayment

cotisations/payment_methods/note_kfet/forms.py

+# -*- mode: python; 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.
+#
+# Copyright © 2018  Pierre-Antoine Comby
+# Copyright © 2018  Gabriel Detraz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+from cotisations.utils import find_payment_method
+
+class NoteCredentialForm(forms.Form):
+    """A special form to get credential to connect to a NoteKfet2015 server throught his API
+    object.
+    """
+    login = forms.CharField(
+            label=_("pseudo note")
+        )
+    password = forms.CharField(
+            label=_("Password"),
+            widget=forms.PasswordInput
+        )
+   

cotisations/payment_methods/note_kfet/models.py

+# -*- mode: python; 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.
+#
+# Copyright © 2018  Pierre-Antoine Comby
+# Copyright © 2018  Gabriel Detraz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from django.db import models
+from django.shortcuts import render
+from django.urls import reverse
+from django.utils.translation import ugettext_lazy as _
+from django.contrib import messages
+
+from cotisations.models import Paiement
+from cotisations.payment_methods.mixins import PaymentMethodMixin
+
+from django.shortcuts import render, redirect
+
+
+class NotePayment(PaymentMethodMixin, models.Model):
+    """
+    The model allowing you to pay with NoteKfet2015.
+    """
+
+    class Meta:
+        verbose_name = _("NoteKfet")
+
+    payment = models.OneToOneField(
+        Paiement,
+        on_delete = models.CASCADE,
+        related_name = 'payment_method',
+        editable = False
+    )
+    server = models.CharField(
+        max_length=255,
+        verbose_name=_("server")
+    )
+    port = models.PositiveIntegerField(
+        blank = True,
+        null = True
+    )
+    id_note = models.PositiveIntegerField(
+        blank = True,
+        null = True
+    )
+
+    def end_payment(self, invoice, request):
+        return redirect(reverse(
+            'cotisations:note_kfet:note_payment',
+            kwargs={'factureid': invoice.id}
+        ))

cotisations/payment_methods/note_kfet/note.py

+#!/usr/bin/python3
+# -*- coding:utf-8 -*-
+
+# Codé par PAC , forké de 20-100
+
+""" Module pour dialoguer avec la NoteKfet2015 """
+
+import socket
+import json
+import ssl
+import traceback
+
+
+def get_response(socket):
+    length_str = b''
+    char = socket.recv(1)
+    while char != b'\n':
+        length_str += char
+        char = socket.recv(1)
+    total = int(length_str)
+    return json.loads(socket.recv(total).decode('utf-8'))
+
+def connect(server, port):
+    sock = socket.socket()
+    try:
+        # On établit la connexion sur port 4242
+        sock.connect((server, port))
+        # On passe en SSL
+        sock = ssl.wrap_socket(sock)
+        # On fait un hello
+        sock.send(b'["hello", "manual"]')
+        retcode = get_response(sock)
+    except:
+        # Si on a foiré quelque part, c'est que le serveur est down
+        return (False, sock, "Serveur indisponible")
+    return (True, sock, "")
+
+def login(server, port, username, password,  masque = [[], [], True]):
+    result, sock, err = connect(server, port)
+    if not result:
+        return (False, None, err)
+    try:
+        commande = ["login", [username, password, "bdd", masque]]
+        sock.send(json.dumps(commande).encode("utf-8"))
+        response = get_response(sock)
+        retcode = response['retcode']
+        if retcode == 0:
+            return (True, sock, "")
+        elif retcode == 5:
+            return (False, sock, "Login incorrect")
+        else:
+            return (False, sock, "Erreur inconnue " + str(retcode))
+    except:
+        # Si on a foiré quelque part, c'est que le serveur est down
+        return (False, sock, "Erreur de communication avec le serveur")
+
+
+def don(sock, montant, id_note, facture):
+    """
+    Faire faire un don à l'id_note
+    """
+    try:
+        sock.send(json.dumps(["dons", [[id_note], round(montant*100), "Facture : id=%s, designation=%s" % (facture.id, facture.name())]]).encode("utf-8"))
+        response = get_response(sock)
+        retcode = response['retcode']
+        transaction_retcode = response["msg"][0][0]
+        if 0 < retcode < 100 or 200 <= retcode or 0 < transaction_retcode < 100 or 200 <= transaction_retcode:
+            return (False, "Transaction échouée. (Solde trop négatif ?)")
+        elif retcode == 0:
+            return (True, "")
+        else:
+            return (False, "Erreur inconnue " + str(retcode))
+    except:
+        return (False, "Erreur de communication avec le serveur")

cotisations/payment_methods/note_kfet/urls.py

+# -*- mode: python; 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.
+#
+# Copyright © 2018 Gabriel Detraz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+    url(
+        r'^note_payment/(?P<factureid>[0-9]+)$',
+        views.note_payment,
+        name='note_payment'
+    ),
+]

cotisations/payment_methods/note_kfet/views.py

+# -*- mode: python; 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.
+#
+# Copyright © 2018  Gabriel Detraz
+# Copyright © 2018  Pierre-Antoine Comby 
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+"""Payment
+
+Here are the views needed by comnpay
+"""
+
+from collections import OrderedDict
+
+from django.urls import reverse
+from django.shortcuts import redirect, get_object_or_404
+from django.contrib.auth.decorators import login_required
+from django.contrib import messages
+from django.views.decorators.csrf import csrf_exempt
+from django.utils.datastructures import MultiValueDictKeyError
+from django.utils.translation import ugettext as _
+from django.http import HttpResponse, HttpResponseBadRequest
+
+from cotisations.models import Facture
+from cotisations.utils import find_payment_method
+from .models import NotePayment
+from re2o.views import form
+from re2o.acl import (
+    can_create,
+    can_edit
+)
+from .note import login, don
+from .forms import NoteCredentialForm
+
+@login_required
+@can_edit(Facture)
+def note_payment(request, facture, factureid):
+    """
+    Build a request to start the negociation with NoteKfet by using
+    a facture id, the price and the login/password data stored in
+    the preferences.
+    """
+    user = facture.user
+    payment_method = find_payment_method(facture.paiement)
+    if not payment_method or not isinstance(payment_method, NotePayment):
+        messages.error(request, "Erreur inconnue")
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': user.id}
+         ))
+    noteform = NoteCredentialForm(request.POST or None)
+    if noteform.is_valid():
+        pseudo = noteform.cleaned_data['login']
+        password = noteform.cleaned_data['password']
+        result, sock, err = login(payment_method.server, payment_method.port, pseudo, password)
+        if not result:
+            messages.error(request, err)
+            return form(
+                {'form': noteform, 'amount': facture.prix_total()},
+                "cotisations/payment.html",
+                request
+            )
+        else:
+            result, err = don(sock, facture.prix_total(), payment_method.id_note, facture)
+            if not result:
+                messages.error(request, err)
+                return form(
+                    {'form': noteform, 'amount': facture.prix_total()},
+                    "cotisations/payment.html",
+                    request
+                )
+        facture.valid = True
+        facture.save()
+        messages.success(request, "Le paiement par note a bien été effectué")
+        return redirect(reverse(
+            'users:profil',
+            kwargs={'userid': user.id}
+         ))
+    return form(
+            {'form': noteform, 'amount': facture.prix_total()},
+            "cotisations/payment.html",
+            request
+        )

cotisations/payment_methods/urls.py

@@ -19,9 +19,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 from django.conf.urls import include, url
-from . import comnpay, cheque
+from . import comnpay, cheque, note_kfet
 
 urlpatterns = [
     url(r'^comnpay/', include(comnpay.urls, namespace='comnpay')),
     url(r'^cheque/', include(cheque.urls, namespace='cheque')),
+    url(r'^note_kfet/', include(note_kfet.urls, namespace='note_kfet')),
 ]

cotisations/templates/cotisations/aff_cotisations.html

@@ -73,12 +73,12 @@ 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 %}
             </td>
             <td>
                 {% if facture.valid %}
                 <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:facture-pdf' facture.id %}">
-                    <i class="fa fa-file-pdf"></i> {% trans "PDF" %}
+                    <i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
                 </a>
                 {% else %}
                 <i class="text-danger">{% trans "Invalidated invoice" %}</i>

cotisations/templates/cotisations/aff_custom_invoice.html

@@ -76,7 +76,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% acl_end %}
                 {% history_button invoice %}
                 <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:custom-invoice-pdf' invoice.id %}">
-                    <i class="fa fa-file-pdf"></i> {% trans "PDF" %}
+                    <i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
                 </a>
             </td>
         </tr>

cotisations/templates/cotisations/control.html

@@ -105,7 +105,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
     {% trans "Edit" as tr_edit %}
-    {% bootstrap_button tr_edit button_type='submit' icon='star' %}
+    {% bootstrap_button tr_edit button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}

cotisations/templates/cotisations/delete.html

@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% blocktrans %}Warning: are you sure you really want to delete this {{ object_name }} object ( {{ objet }} )?{% endblocktrans %}
     </h4>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type='submit' icon='trash' %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='trash' button_class='btn-danger' %}
 </form>
 {% endblock %}
 

cotisations/templates/cotisations/edit_facture.html

@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <h3>{% trans "Edit the invoice" %}</h3>
     {% massive_bootstrap_form factureform 'user' %}
     {{ venteform.management_form }}
-    <h3>{% trans "Invoice's articles" %}</h3>
+    <h3>{% trans "Articles" %}</h3>
     <table class="table table-striped">
         <thead>
             <tr>
@@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
          {% endfor %}
     </table>
     {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type='submit' icon='star' %}
+    {% bootstrap_button tr_confirm button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% endblock %}

cotisations/templates/cotisations/facture.html

@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% if title %}
 <h3>{{ title }}</h3>
 {% else %}
-<h3>{% trans "New invoice" %}</h3>
+<h3>{% trans "Buy" %}</h3>
 {% endif %}
 {% if max_balance %}
 <h4>{% blocktrans %}Maximum allowed balance: {{ max_balance }} €{% endblocktrans %}</h4>
@@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     <div id="paymentMethod"></div>
     {% endif %}
     {% if articlesformset %}
-    <h3>{% trans "Invoice's articles" %}</h3>
+    <h3>{% trans "Articles" %}</h3>
     <div id="form_set" class="form-group">
         {{ articlesformset.management_form }}
         {% for articlesform in articlesformset.forms %}
@@ -67,12 +67,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </div>
         {% endfor %}
     </div>
-    <input class="btn btn-primary btn-sm" role="button" value="{% trans "Add an article"%}" id="add_one">
+    <input class="btn btn-primary btn-block" role="button" value="{% trans "Add an extra article"%}" id="add_one">
     <p>
         {% blocktrans %}Total price: <span id="total_price">0,00</span> €{% endblocktrans %}
     </p>
     {% endif %}
-    {% bootstrap_button action_name button_type='submit' icon='star' %}
+    {% bootstrap_button action_name button_type='submit' icon='ok' button_class='btn-success' %}
 </form>
 
 {% if articlesformset or payment_method%}

cotisations/templates/cotisations/payment.html

@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% bootstrap_form form %}
         {% endif %}
         {% trans "Pay" as tr_pay %}
-        {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' %}
+        {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' button_class='btn-success' %}
     </form>
 {% endblock %}
 

cotisations/utils.py

@@ -89,7 +89,7 @@ def send_mail_invoice(invoice):
         'Votre facture / Your invoice',
         template.render(ctx),
         GeneralOption.get_cached_value('email_from'),
-        [invoice.user.email],
+        [invoice.user.get_mail],
         attachments=[('invoice.pdf', pdf, 'application/pdf')]
     )
     mail.send()

cotisations/views.py

@@ -81,7 +81,7 @@ from .forms import (
 )
 from .tex import render_invoice
 from .payment_methods.forms import payment_method_factory
-from .utils import find_payment_method, send_mail_invoice
+from .utils import find_payment_method
 
 
 @login_required
@@ -148,8 +148,6 @@ def new_facture(request, user, userid):
                     p.facture = new_invoice_instance
                     p.save()
 
-                send_mail_invoice(new_invoice_instance)
-
                 return new_invoice_instance.paiement.end_payment(
                     new_invoice_instance,
                     request
@@ -171,7 +169,7 @@ def new_facture(request, user, userid):
             'articlesformset': article_formset,
             'articlelist': article_list,
             'balance': balance,
-            'action_name': _('Create'),
+            'action_name': _('Confirm'),
         },
         'cotisations/facture.html', request
     )
@@ -193,9 +191,9 @@ def new_custom_invoice(request):
     # Building the invocie form and the article formset
     invoice_form = CustomInvoiceForm(request.POST or None)
 
-    article_formset = formset_factory(SelectArticleForm)(
+    articles_formset = formset_factory(SelectArticleForm)(
         request.POST or None,
-        form_kwargs={'user': request.user, 'target_user': user}
+        form_kwargs={'user': request.user}
     )
 
     if invoice_form.is_valid() and articles_formset.is_valid():
@@ -218,10 +216,9 @@ def new_custom_invoice(request):
         )
         return redirect(reverse('cotisations:index-custom-invoice'))
 
-
     return form({
         'factureform': invoice_form,
-        'action_name': _("Create"),
+        'action_name': _("Confirm"),
         'articlesformset': articles_formset,
         'articlelist': articles
     }, 'cotisations/facture.html', request)
@@ -839,7 +836,6 @@ def credit_solde(request, user, **_kwargs):
         else:
             price_ok = True
         if price_ok:
-            invoice.valid = True
             invoice.save()
             Vente.objects.create(
                 facture=invoice,
@@ -848,8 +844,6 @@ def credit_solde(request, user, **_kwargs):
                 number=1
             )
 
-            send_mail_invoice(invoice)
-
             return invoice.paiement.end_payment(invoice, request)
     p = get_object_or_404(Paiement, is_balance=True)
     return form({
@@ -857,6 +851,6 @@ def credit_solde(request, user, **_kwargs):
         'balance': user.solde,
         'title': _("Refill your balance"),
         'action_name': _("Pay"),
-        'max_balance': p.payment_method.maximum_balance,
+        'max_balance': find_payment_method(p).maximum_balance,
     }, 'cotisations/facture.html', request)
 

logs/templates/logs/sidebar.html

@@ -29,15 +29,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block sidebar %}
     {% can_view_app logs %}
     <a class="list-group-item list-group-item-info" href="{% url "logs:index" %}">
-        <i class="fa fa-clipboard-list"></i>
+        <i class="fa fa-clipboard"></i>
         {% trans "Summary" %}
     </a>
     <a class="list-group-item list-group-item-info" href="{% url "logs:stats-logs" %}">
-        <i class="fa fa-calendar-alt"></i>
+        <i class="fa fa-calendar"></i>
         {% trans "Events" %}
     </a>
     <a class="list-group-item list-group-item-info" href="{% url "logs:stats-general" %}">
-        <i class="fa fa-chart-area"></i>
+        <i class="fa fa-area-chart"></i>
         {% trans "General" %}
     </a>
     <a class="list-group-item list-group-item-info" href="{% url "logs:stats-models" %}">

logs/views.py

@@ -254,6 +254,14 @@ def stats_general(request):
                      .count()),
                     Club.objects.filter(state=Club.STATE_ARCHIVE).count()
                 ],
+                'not_active_users': [
+                    _("Not yet active users"),
+                    User.objects.filter(state=User.STATE_NOT_YET_ACTIVE).count(),
+                    (Adherent.objects
+                     .filter(state=Adherent.STATE_NOT_YET_ACTIVE)
+                     .count()),
+                    Club.objects.filter(state=Club.STATE_NOT_YET_ACTIVE).count()
+                ],
                 'adherent_users': [
                     _("Contributing members"),
                     _all_adherent.count(),

machines/forms.py

@@ -576,13 +576,24 @@ class VlanForm(FormRevMixin, ModelForm):
     """Ajout d'un vlan : id, nom"""
     class Meta:
         model = Vlan
-        fields = '__all__'
+        fields = ['vlan_id', 'name', 'comment']
 
     def __init__(self, *args, **kwargs):
         prefix = kwargs.pop('prefix', self.Meta.model.__name__)
         super(VlanForm, self).__init__(*args, prefix=prefix, **kwargs)
 
 
+class EditOptionVlanForm(FormRevMixin, ModelForm):
+    """Ajout d'un vlan : id, nom"""
+    class Meta:
+        model = Vlan
+        fields = ['dhcp_snooping', 'dhcpv6_snooping', 'arp_protect', 'igmp', 'mld']
+
+    def __init__(self, *args, **kwargs):
+        prefix = kwargs.pop('prefix', self.Meta.model.__name__)
+        super(EditOptionVlanForm, self).__init__(*args, prefix=prefix, **kwargs)
+
+
 class DelVlanForm(FormRevMixin, Form):
     """Suppression d'un ou plusieurs vlans"""
     vlan = forms.ModelMultipleChoiceField(

machines/migrations/0095_auto_20180919_2225.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-09-19 20:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0094_auto_20180815_1918'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='vlan',
+            name='arp_protect',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='vlan',
+            name='dhcp_snooping',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='vlan',
+            name='dhcpv6_snooping',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='vlan',
+            name='igmp',
+            field=models.BooleanField(default=False, help_text='Gestion multicast v4'),
+        ),
+        migrations.AddField(
+            model_name='vlan',
+            name='mld',
+            field=models.BooleanField(default=False, help_text='Gestion multicast v6'),
+        ),
+    ]

machines/models.py

@@ -201,6 +201,12 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
         de cette machine"""
         return str(self.interface_set.first().domain.name)
 
+    @cached_property
+    def complete_name(self):
+        """Par defaut, renvoie le nom de la première interface
+        de cette machine"""
+        return str(self.interface_set.first())
+
     @cached_property
     def all_short_names(self):
         """Renvoie de manière unique, le nom des interfaces de cette
@@ -515,6 +521,18 @@ class Vlan(RevMixin, AclMixin, models.Model):
     vlan_id = models.PositiveIntegerField(validators=[MaxValueValidator(4095)])
     name = models.CharField(max_length=256)
     comment = models.CharField(max_length=256, blank=True)
+    #Réglages supplémentaires
+    arp_protect = models.BooleanField(default=False)
+    dhcp_snooping = models.BooleanField(default=False)
+    dhcpv6_snooping = models.BooleanField(default=False)
+    igmp = models.BooleanField(
+        default=False,
+        help_text="Gestion multicast v4"
+    )
+    mld = models.BooleanField(
+        default=False,
+        help_text="Gestion multicast v6"
+    )
 
     class Meta:
         permissions = (
@@ -1634,6 +1652,19 @@ class Role(RevMixin, AclMixin, models.Model):
             machine__interface__role=cls.objects.filter(specific_role=roletype)