[0-9]+)$', views.disconnect_room, name='disconnect-room'),
+]
diff --git a/multi_op/views.py b/multi_op/views.py
new file mode 100644
index 00000000..7debd02e
--- /dev/null
+++ b/multi_op/views.py
@@ -0,0 +1,163 @@
+# -*- 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 © 2017 Gabriel Détraz
+# Copyright © 2017 Goulven Kermarec
+# Copyright © 2017 Augustin Lemesle
+#
+# 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.
+
+# App de gestion des users pour re2o
+# Goulven Kermarec, Gabriel Détraz, Lemesle Augustin
+# Gplv2
+
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, redirect
+from django.template.loader import render_to_string
+from django.views.decorators.cache import cache_page
+from django.utils.translation import ugettext as _
+from django.urls import reverse
+from django.forms import modelformset_factory
+from django.db.models import Q
+from re2o.views import form
+from re2o.utils import all_has_access, all_adherent
+
+from re2o.base import (
+ re2o_paginator,
+ SortTable,
+)
+
+from re2o.acl import(
+ can_view,
+ can_view_all,
+ can_edit,
+ can_create,
+)
+
+from preferences.models import GeneralOption
+
+from .forms import DormitoryForm
+
+from .preferences.models import(
+ Preferences,
+)
+
+from topologie.models import Room, Dormitory
+
+from .preferences.forms import (
+ EditPreferencesForm,
+)
+
+
+def display_rooms_connection(request, dormitory=None):
+ """View to display global state of connection state"""
+ room_list = Room.objects.select_related('building__dormitory').order_by('building_dormitory', 'port')
+ if dormitory:
+ room_list = room_list.filter(building__dormitory=dormitory)
+ room_list = SortTable.sort(
+ room_list,
+ request.GET.get('col'),
+ request.GET.get('order'),
+ SortTable.TOPOLOGIE_INDEX_ROOM
+ )
+ pagination_number = GeneralOption.get_cached_value('pagination_number')
+ room_list = re2o_paginator(request, room_list, pagination_number)
+ return render(
+ request,
+ 'multi_op/index_room_state.html',
+ {'room_list': room_list}
+ )
+
+
+@login_required
+@can_view_all(Room)
+def aff_state_global(request):
+ return display_rooms_connection(request)
+
+
+@login_required
+@can_view(Dormitory)
+def aff_state_dormitory(request, dormitory, dormitoryid):
+ return display_rooms_connection(dormitory=dormitory)
+
+
+@login_required
+@can_view_all(Room)
+def aff_pending_connection(request):
+ """Aff pending Rooms to connect on our network"""
+ room_list = Room.objects.select_related('building__dormitory').filter(port__isnull=True).filter(adherent__in=all_has_access()).order_by('building_dormitory', 'port')
+ dormitory_form = DormitoryForm(request.POST or None)
+ if dormitory_form.is_valid():
+ room_list = room_list.filter(building__dormitory__in=dormitory_form.cleaned_data['dormitory'])
+ room_list = SortTable.sort(
+ room_list,
+ request.GET.get('col'),
+ request.GET.get('order'),
+ SortTable.TOPOLOGIE_INDEX_ROOM
+ )
+ pagination_number = GeneralOption.get_cached_value('pagination_number')
+ room_list = re2o_paginator(request, room_list, pagination_number)
+ return render(
+ request,
+ 'multi_op/index_room_state.html',
+ {'room_list': room_list, 'dormitory_form': dormitory_form}
+ )
+
+
+@login_required
+@can_view_all(Room)
+def aff_pending_disconnection(request):
+ """Aff pending Rooms to disconnect from our network"""
+ room_list = Room.objects.select_related('building__dormitory').filter(port__isnull=False).exclude(Q(adherent__in=all_has_access()) | Q(adherent__in=all_adherent())).order_by('building_dormitory', 'port')
+ dormitory_form = DormitoryForm(request.POST or None)
+ if dormitory_form.is_valid():
+ room_list = room_list.filter(building__dormitory__in=dormitory_form.cleaned_data['dormitory'])
+ room_list = SortTable.sort(
+ room_list,
+ request.GET.get('col'),
+ request.GET.get('order'),
+ SortTable.TOPOLOGIE_INDEX_ROOM
+ )
+ pagination_number = GeneralOption.get_cached_value('pagination_number')
+ room_list = re2o_paginator(request, room_list, pagination_number)
+ return render(
+ request,
+ 'multi_op/index_room_state.html',
+ {'room_list': room_list, 'dormitory_form': dormitory_form}
+ )
+
+
+@login_required
+@can_edit(Room)
+def disconnect_room(request, room, roomid):
+ """Action of disconnecting a room"""
+ room.port_set.clear()
+ room.save()
+ messages.success(request,'Room %s disconnected' % room)
+ return redirect(reverse(
+ 'multi_op:aff-pending-disconnection'
+ ))
+
+
+def navbar_user():
+ """View to display the app in user's dropdown in the navbar"""
+ return ('topologie', render_to_string('multi_op/navbar.html'))
+
+
+
+
diff --git a/preferences/views.py b/preferences/views.py
index 9a5da84d..d27cdb4f 100644
--- a/preferences/views.py
+++ b/preferences/views.py
@@ -105,7 +105,7 @@ def display_options(request):
document_template_list = DocumentTemplate.objects.order_by('name')
optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O]
- optionnal_templates_list = [app.views.preferences(request) for app in optionnal_apps]
+ optionnal_templates_list = [app.views.preferences(request) for app in optionnal_apps if hasattr(app.views, 'preferences')]
return form({
'useroptions': useroptions,
diff --git a/re2o/context_processors.py b/re2o/context_processors.py
index 3ee39073..97f2d4f8 100644
--- a/re2o/context_processors.py
+++ b/re2o/context_processors.py
@@ -62,8 +62,8 @@ def context_optionnal_apps(request):
"""Fonction de context pour générer la navbar en fonction des
apps optionnels"""
optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O]
- optionnal_templates_navbar_user_list = [app.views.navbar_user(request) for app in optionnal_apps]
- optionnal_templates_navbar_logout_list = [app.views.navbar_logout(request) for app in optionnal_apps]
+ optionnal_templates_navbar_user_list = [app.views.navbar_user() for app in optionnal_apps if hasattr(app.views, 'navbar_user')]
+ optionnal_templates_navbar_logout_list = [app.views.navbar_logout() for app in optionnal_apps if hasattr(app.views, 'navbar_logout')]
return {'optionnal_templates_navbar_user_list':optionnal_templates_navbar_user_list,
'optionnal_templates_navbar_logout_list':optionnal_templates_navbar_logout_list}
diff --git a/re2o/views.py b/re2o/views.py
index 414416a7..d443a84c 100644
--- a/re2o/views.py
+++ b/re2o/views.py
@@ -116,7 +116,7 @@ def contact_page(request):
address = MailContact.objects.all()
optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O]
- optionnal_templates_contact_list = [app.views.contact(request) for app in optionnal_apps]
+ optionnal_templates_contact_list = [app.views.contact(request) for app in optionnal_apps if hasattr(app.views, 'contact')]
return render(
request,
diff --git a/templates/base.html b/templates/base.html
index f116c2be..122c7c3a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -101,9 +101,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Manage the subscriptions" %}
{% acl_end %}
- {% for template in optionnal_templates_navbar_user_list%}
- {{ template }}
- {% endfor %}
+ {% for app, template in optionnal_templates_navbar_user_list %}
+ {% if app != 'topologie' %}
+ {{ template }}
+ {% endif %}
+ {% endfor %}
{% acl_end %}
@@ -114,6 +116,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Switches" %}
{% trans "Access points" %}
{% trans "Rooms" %}
+ {% for app, template in optionnal_templates_navbar_user_list %}
+ {% if app == 'topologie' %}
+ {{ template }}
+ {% endif %}
+ {% endfor %}
{% acl_end %}
diff --git a/tickets/templates/tickets/navbar.html b/tickets/templates/tickets/navbar.html
index 3c4318f7..11473229 100644
--- a/tickets/templates/tickets/navbar.html
+++ b/tickets/templates/tickets/navbar.html
@@ -1,2 +1,2 @@
{% load i18n %}
-{% trans "Tickets" %}
+ {% trans "Tickets" %}
diff --git a/tickets/views.py b/tickets/views.py
index 7fb96511..b16e4eea 100644
--- a/tickets/views.py
+++ b/tickets/views.py
@@ -186,12 +186,12 @@ def preferences(request):
def contact(request):
"""View to display a contact address on the contact page
used here to display a link to open a ticket"""
- return render_to_string('tickets/contact.html')
+ return ('users', render_to_string('tickets/contact.html'))
-def navbar_user(request):
+def navbar_user():
"""View to display the ticket link in thet user's dropdown in the navbar"""
- return render_to_string('tickets/navbar.html')
+ return ('users', render_to_string('tickets/navbar.html'))
-def navbar_logout(request):
+def navbar_logout():
"""View to display the ticket link to log out users"""
return render_to_string('tickets/navbar_logout.html')
diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 00489017..bf3fd9e5 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -187,9 +187,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Room" %}
- {{ users.room }} {% can_view_all Port %}{% if users.room.port_set.all %} /
- {{ users.room.port_set.all|join:", " }} {% endif %}{% acl_end %}
-
+ {{ users.room }} {% if users.room.port_set.all %}{% can_view_all Port %}/
+ {{ users.room.port_set.all|join:", " }} {% acl_else %}
+ {% trans "Connected" %}{% acl_end %}
+ {% else %}{% if users.room %}{% trans "Pending connection..." %}{% endif %}
+ {% endif %}
+
@@ -222,7 +225,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if users.end_adhesion != None %}
{{ users.end_adhesion }}
{% else %}
- {% trans "Not a member" %}
+ {% trans "not a member" %}
{% endif %}
diff --git a/users/views.py b/users/views.py
index 37c0ec88..9764fbe0 100644
--- a/users/views.py
+++ b/users/views.py
@@ -977,7 +977,7 @@ def profil(request, users, **_kwargs):
)
optionnal_apps = [import_module(app) for app in OPTIONNAL_APPS_RE2O]
- optionnal_templates_list = [app.views.profil(request,users) for app in optionnal_apps]
+ optionnal_templates_list = [app.views.profil(request,users) for app in optionnal_apps if hasattr(app.views, 'profil')]
pagination_large_number = GeneralOption.get_cached_value(
'pagination_large_number'