Rename Borne en AccessPoint

re2o/templatetags/acl.py

@@ -122,6 +122,7 @@ MODEL_NAME = {
     # topologie
     'Stack' : topologie.models.Stack,
     'Switch' : topologie.models.Switch,
+    'AccessPoint' : topologie.models.AccessPoint,
     'ModelSwitch' : topologie.models.ModelSwitch,
     'ConstructorSwitch' : topologie.models.ConstructorSwitch,
     'Port' : topologie.models.Port,

re2o/utils.py

@@ -234,9 +234,9 @@ class SortTable:
         'default': ['name']
     }
     TOPOLOGIE_INDEX_BORNE = {
-        'borne_name': ['domain__name'],
-        'borne_ip': ['ipv4__ipv4'],
-        'borne_mac': ['mac_address'],
+        'ap_name': ['domain__name'],
+        'ap_ip': ['ipv4__ipv4'],
+        'ap_mac': ['mac_address'],
         'default': ['domain__name']
     }
     TOPOLOGIE_INDEX_STACK = {

re2o/views.py

@@ -83,7 +83,7 @@ HISTORY_BIND = {
         'stack' : topologie.models.Stack,
         'model_switch' : topologie.models.ModelSwitch,
         'constructor_switch' : topologie.models.ConstructorSwitch,
-        'borne' : topologie.models.Borne,
+        'ap' : topologie.models.AccessPoint,
     },
     'machines' : {
         'machine' : machines.models.Machine,

topologie/admin.py

@@ -36,7 +36,7 @@ from .models import (
     Stack,
     ModelSwitch,
     ConstructorSwitch,
-    Borne
+    AccessPoint
 )
 
 
@@ -55,7 +55,7 @@ class PortAdmin(VersionAdmin):
     pass
 
 
-class BorneAdmin(VersionAdmin):
+class AccessPointAdmin(VersionAdmin):
     """Administration d'une borne"""
     pass
 
@@ -76,7 +76,7 @@ class ConstructorSwitchAdmin(VersionAdmin):
 
 
 admin.site.register(Port, PortAdmin)
-admin.site.register(Borne, BorneAdmin)
+admin.site.register(AccessPoint, AccessPointAdmin)
 admin.site.register(Room, RoomAdmin)
 admin.site.register(Switch, SwitchAdmin)
 admin.site.register(Stack, StackAdmin)

topologie/forms.py

@@ -43,7 +43,7 @@ from .models import (
     Stack,
     ModelSwitch,
     ConstructorSwitch,
-    Borne
+    AccessPoint
 )
 
 
@@ -111,18 +111,18 @@ class StackForm(ModelForm):
         super(StackForm, self).__init__(*args, prefix=prefix, **kwargs)
 
 
-class AddBorneForm(EditInterfaceForm):
+class AddAccessPointForm(EditInterfaceForm):
     """Formulaire pour la création d'une borne
     Relié directement au modèle borne"""
     class Meta:
-        model = Borne
+        model = AccessPoint
         fields = ['mac_address', 'type', 'ipv4', 'details', 'location']
 
 
-class EditBorneForm(EditInterfaceForm):
+class EditAccessPointForm(EditInterfaceForm):
     """Edition d'une interface. Edition complète"""
     class Meta:
-        model = Borne
+        model = AccessPoint
         fields = ['machine', 'type', 'ipv4', 'mac_address', 'details', 'location']
 
 

topologie/migrations/0044_auto_20180326_0002.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-03-25 22:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0043_renamenewswitch'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Borne',
+            new_name='AccessPoint',
+        ),
+        migrations.AlterModelOptions(
+            name='accesspoint',
+            options={'permissions': (('view_ap', 'Peut voir une borne'),)},
+        ),
+        migrations.AlterModelOptions(
+            name='switch',
+            options={'permissions': (('view_switch', 'Peut voir un objet switch'),)},
+        ),
+    ]

topologie/models.py

@@ -109,7 +109,7 @@ class Stack(models.Model):
                 inférieure à l'id minimale"})
 
 
-class Borne(Interface):
+class AccessPoint(Interface):
     """Define a wireless AP. Inherit from machines.interfaces
     
     Definition pour une borne wifi , hérite de machines.interfaces
@@ -125,33 +125,33 @@ class Borne(Interface):
 
     class Meta:
         permissions = (
-            ("view_borne", "Peut voir une borne"),
+            ("view_ap", "Peut voir une borne"),
         )
 
-    def get_instance(borne_id, *args, **kwargs):
-        return Borne.objects.get(pk=borne_id)
+    def get_instance(ap_id, *args, **kwargs):
+        return AccessPoint.objects.get(pk=ap_id)
 
     def can_create(user_request, *args, **kwargs):
-        return user_request.has_perm('topologie.add_borne') , u"Vous n'avez pas le droit\
+        return user_request.has_perm('topologie.add_ap') , u"Vous n'avez pas le droit\
             de créer une borne"
 
     def can_edit(self, user_request, *args, **kwargs):
-        if not user_request.has_perm('topologie.change_borne'):
+        if not user_request.has_perm('topologie.change_ap'):
             return False, u"Vous n'avez pas le droit d'éditer des bornes"
         return True, None
 
     def can_delete(self, user_request, *args, **kwargs):
-        if not user_request.has_perm('topologie.delete_borne'):
+        if not user_request.has_perm('topologie.delete_ap'):
             return False, u"Vous n'avez pas le droit de supprimer une borne"
         return True, None
 
     def can_view_all(user_request, *args, **kwargs):
-        if not user_request.has_perm('topologie.view_borne'):
+        if not user_request.has_perm('topologie.view_ap'):
             return False, u"Vous n'avez pas le droit de voir les bornes"
         return True, None
 
     def can_view(self, user_request, *args, **kwargs):
-        if not user_request.has_perm('topologie.view_borne'):
+        if not user_request.has_perm('topologie.view_ap'):
             return False, u"Vous n'avez pas le droit de voir les bornes"
         return True, None
 

topologie/templates/topologie/aff_borne.html → topologie/templates/topologie/aff_ap.html

@@ -25,50 +25,50 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 
 <div class="table-responsive">
-{% if borne_list.paginator %}
-{% include "pagination.html" with list=borne_list %}
-{% endif %}
+	{% if ap_list.paginator %}
+	{% include "pagination.html" with list=ap_list %}
+	{% endif %}
 
 
-<table class="table table-striped">
-    <thead>
-        <tr>
-            <th>{% include "buttons/sort.html" with prefix='borne' col='name' text='Borne' %}</th>
-	    <th>{% include "buttons/sort.html" with prefix='borne' col='mac' text='Addresse mac' %}</th>
-	    <th>{% include "buttons/sort.html" with prefix='borne' col='ip' text='Ipv4' %}</th>
-	    <th>Commentaire</th>
-            <th>Localisation</th> 
-	    <th></th>
-        </tr>
-   </thead>
-   {% for borne in borne_list %}
-   <tr>
-       <td>{{borne}}</td>
-       <td>{{borne.mac_address}}</td>
-       <td>{{borne.ipv4}}</td>
-       <td>{{borne.details}}</td>
-       <td>{{borne.location}}</td>
-        <td class="text-right">
-            <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'borne' borne.pk %}">
-                <i class="fa fa-history"></i>
-            </a>
-        {% can_edit borne %}
-            <a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-borne' borne.id %}">
-                <i class="fa fa-edit"></i>
-            </a>
-	{% acl_end %}
-	{% can_delete borne %}
-            <a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'machines:del-interface' borne.id %}">
-                <i class="fa fa-trash"></i>
-            </a>
-        {% acl_end %}
-        </td>
-   </tr>
-   {% endfor %}
-</table>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th>{% include "buttons/sort.html" with prefix='ap' col='name' text='Borne' %}</th>
+				<th>{% include "buttons/sort.html" with prefix='ap' col='mac' text='Addresse mac' %}</th>
+				<th>{% include "buttons/sort.html" with prefix='ap' col='ip' text='Ipv4' %}</th>
+				<th>Commentaire</th>
+				<th>Localisation</th> 
+				<th></th>
+			</tr>
+		</thead>
+		{% for ap in ap_list %}
+		<tr>
+			<td>{{ap}}</td>
+			<td>{{ap.mac_address}}</td>
+			<td>{{ap.ipv4}}</td>
+			<td>{{ap.details}}</td>
+			<td>{{ap.location}}</td>
+			<td class="text-right">
+				<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'ap' ap.pk %}">
+					<i class="fa fa-history"></i>
+				</a>
+				{% can_edit ap %}
+				<a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-ap' ap.id %}">
+					<i class="fa fa-edit"></i>
+				</a>
+				{% acl_end %}
+				{% can_delete ap %}
+				<a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'machines:del-interface' ap.id %}">
+					<i class="fa fa-trash"></i>
+				</a>
+				{% acl_end %}
+			</td>
+		</tr>
+		{% endfor %}
+	</table>
 
 
-{% if borne_list.paginator %}
-{% include "pagination.html" with list=borne_list %}
+	{% if ap_list.paginator %}
+{% include "pagination.html" with list=ap_list %}
 {% endif %}
 </div>

topologie/templates/topologie/index_borne.html → topologie/templates/topologie/index_ap.html

@@ -30,11 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Points d'accès WiFi</h2>
-{% can_create Room %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-borne' %}"><i class="fa fa-plus"></i> Ajouter une borne</a>
+{% can_create AccessPoint %}
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-ap' %}"><i class="fa fa-plus"></i> Ajouter une borne</a>
 <hr>
 {% acl_end %}
-    {% include "topologie/aff_borne.html" with borne_list=borne_list %}
+    {% include "topologie/aff_ap.html" with ap_list=ap_list %}
     <br />
     <br />
     <br />

topologie/templates/topologie/sidebar.html

@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <i class="fa fa-microchip"></i>
         Switchs
     </a>
-     <a class="list-group-item list-group-item-info" href="{% url "topologie:index-borne" %}">
+     <a class="list-group-item list-group-item-info" href="{% url "topologie:index-ap" %}">
         <i class="fa fa-wifi"></i>
         Bornes WiFi
     </a>

topologie/urls.py

@@ -35,11 +35,11 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.index, name='index'),
-    url(r'^index_borne/$', views.index_borne, name='index-borne'),
-    url(r'^new_borne/$', views.new_borne, name='new-borne'),
-    url(r'^edit_borne/(?P<borne_id>[0-9]+)$',
-        views.edit_borne,
-        name='edit-borne'),
+    url(r'^index_ap/$', views.index_ap, name='index-ap'),
+    url(r'^new_ap/$', views.new_ap, name='new-ap'),
+    url(r'^edit_ap/(?P<ap_id>[0-9]+)$',
+        views.edit_ap,
+        name='edit-ap'),
     url(r'^create_ports/(?P<switch_id>[0-9]+)$',
         views.create_ports,
         name='create-ports'),

topologie/views.py

@@ -54,7 +54,7 @@ from topologie.models import (
     Stack,
     ModelSwitch,
     ConstructorSwitch,
-    Borne
+    AccessPoint
 )
 from topologie.forms import EditPortForm, NewSwitchForm, EditSwitchForm
 from topologie.forms import (
@@ -64,8 +64,8 @@ from topologie.forms import (
     EditModelSwitchForm,
     EditConstructorSwitchForm,
     CreatePortsForm,
-    AddBorneForm,
-    EditBorneForm
+    AddAccessPointForm,
+    EditAccessPointForm
 )
 from users.views import form
 from re2o.utils import SortTable
@@ -172,29 +172,29 @@ def index_room(request):
 
 
 @login_required
-@can_view_all(Borne)
-def index_borne(request):
+@can_view_all(AccessPoint)
+def index_ap(request):
     """ Affichage de l'ensemble des bornes"""
-    borne_list = Borne.objects
-    borne_list = SortTable.sort(
-        borne_list,
+    ap_list = AccessPoint.objects
+    ap_list = SortTable.sort(
+        ap_list,
         request.GET.get('col'),
         request.GET.get('order'),
         SortTable.TOPOLOGIE_INDEX_BORNE
     )
     pagination_number = GeneralOption.get_cached_value('pagination_number')
-    paginator = Paginator(borne_list, pagination_number)
+    paginator = Paginator(ap_list, pagination_number)
     page = request.GET.get('page')
     try:
-        borne_list = paginator.page(page)
+        ap_list = paginator.page(page)
     except PageNotAnInteger:
         # If page is not an integer, deliver first page.
-        borne_list = paginator.page(1)
+        ap_list = paginator.page(1)
     except EmptyPage:
         # If page is out of range (e.g. 9999), deliver last page of results.
-        borne_list = paginator.page(paginator.num_pages)
-    return render(request, 'topologie/index_borne.html', {
-        'borne_list': borne_list
+        ap_list = paginator.page(paginator.num_pages)
+    return render(request, 'topologie/index_ap.html', {
+        'ap_list': ap_list
         })
 
 
@@ -526,12 +526,12 @@ def edit_switch(request, switch, switch_id):
 
 
 @login_required
-@can_create(Borne)
-def new_borne(request):
-    """ Creation d'une borne. Cree en meme temps l'interface et la machine
+@can_create(AccessPoint)
+def new_ap(request):
+    """ Creation d'une ap. Cree en meme temps l'interface et la machine
     associée. Vue complexe. Appelle successivement les 3 models forms
     adaptés : machine, interface, domain et switch"""
-    borne = AddBorneForm(
+    ap = AddAccessPointForm(
         request.POST or None,
         user=request.user
     )
@@ -542,7 +542,7 @@ def new_borne(request):
     domain = DomainForm(
         request.POST or None,
         )
-    if borne.is_valid() and machine.is_valid():
+    if ap.is_valid() and machine.is_valid():
         user = AssoOption.get_cached_value('utilisateur_asso')
         if not user:
             messages.error(request, "L'user association n'existe pas encore,\
@@ -550,29 +550,29 @@ def new_borne(request):
             return redirect(reverse('topologie:index'))
         new_machine = machine.save(commit=False)
         new_machine.user = user
-        new_borne = borne.save(commit=False)
-        domain.instance.interface_parent = new_borne
+        new_ap = ap.save(commit=False)
+        domain.instance.interface_parent = new_ap
         if domain.is_valid():
             new_domain_instance = domain.save(commit=False)
             with transaction.atomic(), reversion.create_revision():
                 new_machine.save()
                 reversion.set_user(request.user)
                 reversion.set_comment("Création")
-            new_borne.machine = new_machine
+            new_ap.machine = new_machine
             with transaction.atomic(), reversion.create_revision():
-                new_borne.save()
+                new_ap.save()
                 reversion.set_user(request.user)
                 reversion.set_comment("Création")
-            new_domain_instance.interface_parent = new_borne
+            new_domain_instance.interface_parent = new_ap
             with transaction.atomic(), reversion.create_revision():
                 new_domain_instance.save()
                 reversion.set_user(request.user)
                 reversion.set_comment("Création")
             messages.success(request, "La borne a été créé")
-            return redirect(reverse('topologie:index-borne'))
-    i_mbf_param = generate_ipv4_mbf_param(borne, False)
+            return redirect(reverse('topologie:index-ap'))
+    i_mbf_param = generate_ipv4_mbf_param(ap, False)
     return form({
-        'topoform': borne,
+        'topoform': ap,
         'machineform': machine,
         'domainform': domain,
         'i_mbf_param': i_mbf_param,
@@ -581,32 +581,32 @@ def new_borne(request):
 
 
 @login_required
-@can_edit(Borne)
-def edit_borne(request, borne, borne_id):
+@can_edit(AccessPoint)
+def edit_ap(request, ap, ap_id):
     """ Edition d'un switch. Permet de chambre nombre de ports,
     place dans le stack, interface et machine associée"""
-    borne_form = EditBorneForm(
+    ap_form = EditAccessPointForm(
         request.POST or None,
         user=request.user,
-        instance=borne
+        instance=ap
     )
     machine_form = NewMachineForm(
         request.POST or None,
         user=request.user,
-        instance=borne.machine
+        instance=ap.machine
     )
     domain_form = DomainForm(
         request.POST or None,
-        instance=borne.domain
+        instance=ap.domain
         )
-    if borne_form.is_valid() and machine_form.is_valid():
+    if ap_form.is_valid() and machine_form.is_valid():
         user = AssoOption.get_cached_value('utilisateur_asso')
         if not user:
             messages.error(request, "L'user association n'existe pas encore,\
             veuillez le créer ou le linker dans preferences")
-            return redirect(reverse('topologie:index-borne'))
+            return redirect(reverse('topologie:index-ap'))
         new_machine = machine_form.save(commit=False)
-        new_borne = borne_form.save(commit=False)
+        new_ap = ap_form.save(commit=False)
         new_domain = domain_form.save(commit=False)
         with transaction.atomic(), reversion.create_revision():
             new_machine.save()
@@ -616,10 +616,10 @@ def edit_borne(request, borne, borne_id):
                     field for field in machine_form.changed_data)
             )
         with transaction.atomic(), reversion.create_revision():
-            new_borne.save()
+            new_ap.save()
             reversion.set_user(request.user)
             reversion.set_comment("Champs modifié(s) : %s" % ', '.join(
-                field for field in borne_form.changed_data)
+                field for field in ap_form.changed_data)
             )
             reversion.set_comment("Création")
         with transaction.atomic(), reversion.create_revision():
@@ -629,10 +629,10 @@ def edit_borne(request, borne, borne_id):
                 field for field in domain_form.changed_data)
             )
         messages.success(request, "La borne a été modifiée")
-        return redirect(reverse('topologie:index-borne'))
-    i_mbf_param = generate_ipv4_mbf_param(borne_form, False )
+        return redirect(reverse('topologie:index-ap'))
+    i_mbf_param = generate_ipv4_mbf_param(ap_form, False )
     return form({
-        'topoform': borne_form,
+        'topoform': ap_form,
         'machineform': machine_form,
         'domainform': domain_form,
         'i_mbf_param': i_mbf_param,