diff --git a/preferences/models.py b/preferences/models.py
index d6a1c6b6..f7d42c10 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -282,6 +282,10 @@ class MailContact(AclMixin, models.Model):
max_length = 256
)
+ @cached_property
+ def get_name(self):
+ return self.address.split("@")[0]
+
class Meta:
permissions = (
("view_mailcontact", "Peut voir les mails de contact"),
diff --git a/re2o/templates/re2o/contact.html b/re2o/templates/re2o/contact.html
new file mode 100644
index 00000000..474ac7e8
--- /dev/null
+++ b/re2o/templates/re2o/contact.html
@@ -0,0 +1,52 @@
+{% extends "re2o/sidebar.html" %}
+{% comment %}
+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.
+{% endcomment %}
+
+{% load bootstrap3 %}
+{% load i18n %}
+
+{% block title %}{% trans "Contact" %}{% endblock %}
+
+{% block content %}
+
{% blocktrans %}Contacter l'association {{asso_name}}{% endblocktrans %}
+
+
+{% for contact in contacts %}
+
+
+
{{ contact.get_name }}
+
+
+
{{ contact.commentary}}
+
+
+
+
+
+{% endfor %}
+
+
+
+{% endblock %}
+
diff --git a/re2o/views.py b/re2o/views.py
index 9a9dec78..aaf69602 100644
--- a/re2o/views.py
+++ b/re2o/views.py
@@ -36,6 +36,8 @@ from django.views.decorators.cache import cache_page
from preferences.models import (
Service,
+ MailContact,
+ GeneralOption,
AssoOption,
HomeOption
)
@@ -60,12 +62,125 @@ def index(request):
twitter_account_name = HomeOption.get_cached_value('twitter_account_name')
asso_name = AssoOption.get_cached_value('pseudo')
return form({
- 'services_urls': services,
- 'twitter_url': twitter_url,
- 'twitter_account_name': twitter_account_name,
- 'facebook_url': facebook_url,
- 'asso_name': asso_name
- }, 're2o/index.html', request)
+ 'services_urls': services,
+ 'twitter_url': twitter_url,
+ 'twitter_account_name' : twitter_account_name,
+ 'facebook_url': facebook_url,
+ 'asso_name': asso_name
+ }, 're2o/index.html', request)
+
+
+#: Binding the corresponding char sequence of history url to re2o models.
+HISTORY_BIND = {
+ 'users': {
+ 'user': users.models.User,
+ 'ban': users.models.Ban,
+ 'mailalias': users.models.MailAlias,
+ 'whitelist': users.models.Whitelist,
+ 'school': users.models.School,
+ 'listright': users.models.ListRight,
+ 'serviceuser': users.models.ServiceUser,
+ 'listshell': users.models.ListShell,
+ },
+ 'preferences': {
+ 'service': preferences.models.Service,
+ 'mailcontact': preferences.models.MailContact,
+ },
+ 'cotisations': {
+ 'facture': cotisations.models.Facture,
+ 'article': cotisations.models.Article,
+ 'paiement': cotisations.models.Paiement,
+ 'banque': cotisations.models.Banque,
+ },
+ 'topologie': {
+ 'switch': topologie.models.Switch,
+ 'port': topologie.models.Port,
+ 'room': topologie.models.Room,
+ 'stack': topologie.models.Stack,
+ 'modelswitch': topologie.models.ModelSwitch,
+ 'constructorswitch': topologie.models.ConstructorSwitch,
+ 'accesspoint': topologie.models.AccessPoint,
+ 'switchbay': topologie.models.SwitchBay,
+ 'building': topologie.models.Building,
+ },
+ 'machines': {
+ 'machine': machines.models.Machine,
+ 'interface': machines.models.Interface,
+ 'domain': machines.models.Domain,
+ 'machinetype': machines.models.MachineType,
+ 'iptype': machines.models.IpType,
+ 'extension': machines.models.Extension,
+ 'soa': machines.models.SOA,
+ 'mx': machines.models.Mx,
+ 'txt': machines.models.Txt,
+ 'dname': machines.models.DName,
+ 'srv': machines.models.Srv,
+ 'ns': machines.models.Ns,
+ 'service': machines.models.Service,
+ 'role': machines.models.Role,
+ 'vlan': machines.models.Vlan,
+ 'nas': machines.models.Nas,
+ 'ipv6list': machines.models.Ipv6List,
+ 'sshfingerprint': machines.models.SshFingerprint,
+ 'sshfpralgo': machines.models.SshFprAlgo,
+ },
+}
+
+
+@login_required
+def history(request, application, object_name, object_id):
+ """Render history for a model.
+
+ The model is determined using the `HISTORY_BIND` dictionnary if none is
+ found, raises a Http404. The view checks if the user is allowed to see the
+ history using the `can_view` method of the model.
+
+ Args:
+ request: The request sent by the user.
+ object_name: Name of the model.
+ object_id: Id of the object you want to acces history.
+
+ Returns:
+ The rendered page of history if access is granted, else the user is
+ redirected to their profile page, with an error message.
+
+ Raises:
+ Http404: This kind of models doesn't have history.
+ """
+ try:
+ model = HISTORY_BIND[application][object_name]
+ except KeyError:
+ raise Http404(u"Il n'existe pas d'historique pour ce modèle.")
+ object_name_id = object_name + 'id'
+ kwargs = {object_name_id: object_id}
+ try:
+ instance = model.get_instance(**kwargs)
+ except model.DoesNotExist:
+ messages.error(request, u"Entrée inexistante")
+ return redirect(reverse(
+ 'users:profil',
+ kwargs={'userid': str(request.user.id)}
+ ))
+ can, msg = instance.can_view(request.user)
+ if not can:
+ messages.error(request, msg or "Vous ne pouvez pas accéder à ce menu")
+ return redirect(reverse(
+ 'users:profil',
+ kwargs={'userid': str(request.user.id)}
+ ))
+ pagination_number = GeneralOption.get_cached_value('pagination_number')
+ reversions = Version.objects.get_for_object(instance)
+ if hasattr(instance, 'linked_objects'):
+ for related_object in chain(instance.linked_objects()):
+ reversions = (reversions |
+ Version.objects.get_for_object(related_object))
+ reversions = re2o_paginator(request, reversions, pagination_number)
+ return render(
+ request,
+ 're2o/history.html',
+ {'reversions': reversions, 'object': instance}
+ )
+>>>>>>> e42b8f9... Page de contact coté utilisateur
@cache_page(7 * 24 * 60 * 60)
@@ -106,6 +221,21 @@ def about_page(request):
}
)
+def contact_page(request):
+ """The view for the contact page
+ Send all the objects MailContact
+ """
+ address = MailContact.objects.all()
+
+ return render(
+ request,
+ "re2o/contact.html",
+ {
+ 'contacts': address,
+ 'asso_name': AssoOption.objects.first().name
+ }
+ )
+
def handler500(request):
"""The handler view for a 500 error"""