Merge branch 'django17_AbstractU_Polymorph' into static_pdf_invoices

Conflicts:
	coin/billing/models.py

README.md

@@ -42,7 +42,7 @@ Then run:
 You should now be able to run `python manage.py` (within the
 virtualenv, obviously) without error.
 
-The `coin/settings_local.py` file is ignore by Git: feel free to override any
+The `coin/settings_local.py` file is ignored by Git: feel free to override any
 setting by writing into that file. For example, to override the `DEBUG`
 settings:
 
@@ -50,17 +50,24 @@ settings:
     echo 'DEBUG = TEMPLATE_DEBUG = True' >> coin/settings_local.py
 
 
-To sync database, the first time run :
+At this point, you should setup your database.  Recommended is postgreSQL,
+but you might be able to use SQLite.  For more information, see https://www.illyse.org/projects/ils-si/wiki/Mise_en_place_environnement_de_dev
 
-  python manage.py syncdb --migrate
+The first time, you need to create the database, create a superuser, and
+import some base data to play with:
 
-You probably want to import some base data to play with:
+    python manage.py migrate
+    python manage.py createsuperuser
+    python manage.py loaddata offers ip_pool
 
-  python manage.py loaddata offers ip_pool
+Then, at each code update, you only need to apply migrations:
 
-Then at each code update :
+    python manage.py migrate
 
-  python manage.py migrate
+
+At this point, Django should run correctly:
+
+    python manage.py runserver
 
 
 More information

coin/billing/templates/billing/invoice.html

@@ -7,7 +7,7 @@
         <p>Émise le {{ invoice.date }}</p>
     </div>
     <div class="large-4 columns">
-        <a href="{% url 'billing:invoice_pdf' id=invoice.number %}" target="_blank" class="button">Télécharger en PDF</a>
+        <a href="{% url 'billing:invoice_pdf' id=invoice.number %}" target="_blank" class="button expand"><i class="fa fa-file-pdf-o"></i> Télécharger en PDF</a>
     </div>
 </div>
 

coin/members/models.py

@@ -9,8 +9,9 @@ from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.contrib.auth.models import AbstractUser
 from django.conf import settings
+from django.core.validators import RegexValidator
 from ldapdb.models.fields import CharField, IntegerField, ListField
-from south.modelsinspector import add_ignored_fields
+
 from coin.offers.models import OfferSubscription
 from coin.mixins import CoinLdapSyncMixin
 from coin import utils
@@ -45,9 +46,11 @@ class Member(CoinLdapSyncMixin, AbstractUser):
                                            verbose_name=u'Téléphone mobile')
     # TODO: use a django module that provides an address model? (would
     # support more countries and address types)
-    address = models.TextField(verbose_name=u'Adresse', blank=True, null=True)
-    postal_code = models.CharField(max_length=15, blank=True, null=True,
-                                   verbose_name=u'Code postal')
+    address = models.TextField(verbose_name=u'adresse', blank=True, null=True)
+    postal_code = models.CharField(max_length=5, blank=True, null=True,
+                                   validators=[RegexValidator(regex=r'^\d{5}$',
+                                               message=u'Code postal non valide.')],
+                                   verbose_name=u'code postal')
     city = models.CharField(max_length=200, blank=True, null=True,
                             verbose_name=u'Commune')
     country = models.CharField(max_length=200, blank=True, null=True,

coin/members/templates/members/invoices.html

@@ -20,7 +20,7 @@
             <td>{{ invoice.date }}</td>
             <td>{{ invoice.amount }}</td>
             <td{% if invoice.amount_remaining_to_pay > 0 %} class="unpaid"{% endif %}>{{ invoice.amount_remaining_to_pay }}</td>
-            <td><a href="{% url 'billing:invoice_pdf' id=invoice.number %}">PDF</a></td>
+            <td><a href="{% url 'billing:invoice_pdf' id=invoice.number %}"><i class="fa fa-file-pdf-o"></i> PDF</a></td>
         </tr>
         {% endfor %}
     </tbody>

coin/members/templates/members/subscriptions.html

@@ -16,8 +16,8 @@
     <tbody>
         {% for subscription in subscriptions %}
         <tr>
-            <td>{{ subscription.offer.type }}</td>
-            <td>{{ subscription.offer.name }}</td>
+            <td>{{ subscription.offer.get_configuration_type_display }}</td>
+            <td>{{ subscription.offer.name }}</td>
             <td>{{ subscription.subscription_date }}</td>
             <td>{{ subscription.configuration.comment }}</td>
             <td>{% if subscription.configuration %}<a href="{% url subscription.configuration.get_url_namespace|add:":details" id=subscription.configuration.id %}"><i class="fa fa-cog"></i> Configuration</a>{% endif %}</td>

coin/settings.py

@@ -227,6 +227,9 @@ DEFAULT_FROM_EMAIL = "adminsys@illyse.org"
 #EMAIL_HOST = "smtp.chezmoi.tld"
 
 
+# Reset session if cookie older than 2h.
+SESSION_COOKIE_AGE = 7200
+
 # Surcharge les paramètres en utilisant le fichier settings_local.py
 try:
     from settings_local import *

coin/utils.py

@@ -67,3 +67,11 @@ def send_templated_email(subject, to, template_to_use, context, attachements, fr
 
     #Send email
     msg.send()
+
+def delete_selected(modeladmin, request, queryset):
+    """Overrides QuerySet's delete() function to remove objects one by one 
+    so, that they are deleted in the LDAP (Redmine issue #195)."""
+    for obj in queryset:
+        obj.delete()
+
+delete_selected.short_description = "Supprimer tous les objets sélectionnés."

coin/vpn/admin.py

@@ -4,7 +4,7 @@ from polymorphic.admin import PolymorphicChildModelAdmin
 
 from coin.vpn.models import VPNConfiguration
 from coin.configuration.admin import ConfigurationAdminFormMixin
-
+from coin.utils import delete_selected
 
 class VPNConfigurationInline(admin.StackedInline):
     model = VPNConfiguration
@@ -22,7 +22,7 @@ class VPNConfigurationAdmin(ConfigurationAdminFormMixin, PolymorphicChildModelAd
                      'administrative_subscription__member__first_name',
                      'administrative_subscription__member__last_name',
                      'administrative_subscription__member__email')
-    actions = ("generate_endpoints", "generate_endpoints_v4",
+    actions = (delete_selected, "generate_endpoints", "generate_endpoints_v4",
                "generate_endpoints_v6", "activate", "deactivate")
     exclude = ("password",)
     inline = VPNConfigurationInline

coin/vpn/models.py

@@ -2,6 +2,7 @@
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.conf import settings
+from django.core.urlresolvers import reverse
 from netfields import InetAddressField, NetManager
 import ldapdb.models
 from ldapdb.models.fields import CharField, ListField
@@ -23,16 +24,25 @@ class VPNConfiguration(CoinLdapSyncMixin, Configuration):
     #     validators=[ValidateBackendType(backend_name)])
     activated = models.BooleanField(default=False)
     login = models.CharField(max_length=50, unique=True, blank=True,
+                             verbose_name="identifiant",
                              help_text="leave empty for automatic generation")
     password = models.CharField(max_length=256, blank=True, null=True)
     ipv4_endpoint = InetAddressField(validators=[validation.validate_v4],
-                                     blank=True, null=True)
+                                     verbose_name="IPv4", blank=True, null=True,
+                                     help_text="Addresse IPv4 utilisée par "
+                                     "défaut sur le VPN")
     ipv6_endpoint = InetAddressField(validators=[validation.validate_v6],
-                                     blank=True, null=True)
-    comment = models.CharField(blank=True, max_length=512)
+                                     verbose_name="IPv6", blank=True, null=True,
+                                     help_text="Addresse IPv6 utilisée par "
+                                     "défaut sur le VPN")
+    comment = models.CharField(blank=True, max_length=512,
+                               verbose_name="commentaire")
 
     objects = NetManager()
 
+    def get_absolute_url(self):
+        return reverse('vpn:openvpn_ldap', args=[str(self.pk)])
+
     # These two methods are part of the general configuration interface.
     def save_subnet(self, subnet, creation):
         self.check_endpoints(delete=True)

coin/vpn/templates/vpn/vpn.html

@@ -7,6 +7,7 @@
     <div class="large-6 columns">
         <div class="panel">
             <h3>Statut</h3>
+            <form action="{{ object.get_absolute_url }}" method="post">{% csrf_token %}
             <table class="full-width">
                 <tr>
                     <td class="center"><span class="label">Identifiant</span></td>
@@ -19,15 +20,16 @@
                     </td>
                 </tr>
                 {% endblock %}<tr class="flatfield">
-                    <td class="center"><span class="label">Commentaire</span></td>
-                    <td><input type="text" value="{{object.comment}}" /></td>
+                    <td class="center">{{ form.comment.label_tag }}</td>
+                    <td>{{ form.comment }}</td>
                 </tr>
                 <tr>
                     <td class="center boolviewer" colspan="2">
                         <input type="checkbox" disabled="disabled"{% if object.activated %} checked="checked"{% endif %} />
-                        <span>Ce VPN est {% if object.activated %}activé{% else %}désactivé{% endif %}</span>
+                        <span>Ce VPN est {{ object.activated|yesno:"activé,désactivé" }}</span>
                     </td>
                 </tr>
+                <tr><td class="center" colspan="2"><input type="submit" value="Valider" /></td></tr>
             </table>
         </div>
     </div>
@@ -36,25 +38,26 @@
         <div class="panel">
             <h3>Adresses IP</h3>
             <table class="full-width">
+              {{ form.non_field_errors }}
                 <tr class="flatfield">
-                    <td class="center"><span class="label">IPv4</span></td>
-                    <td><input type="text" name="endpoint4" {% if object.ipv4_endpoint %}value="{{ object.ipv4_endpoint }}" {% endif %} placeholder="Aucune adresse"/></td>
+                    <td class="center">{{ form.ipv4_endpoint.label_tag }}</td>
+                    <td>{{ form.ipv4_endpoint }} {{ form.ipv4_endpoint.errors }}</td>
                 </tr>
                 <tr class="flatfield">
-                    <td class="center"><span class="label">IPv6</span></td>
-                    <td><input type="text" name="endpoint6" {% if object.ipv6_endpoint %}value="{{ object.ipv6_endpoint }}" {% endif %} placeholder="Aucune adresse"/></td>
+                    <td class="center">{{ form.ipv6_endpoint.label_tag }}</td>
+                    <td>{{ form.ipv6_endpoint }} {{ form.ipv6_endpoint.errors }}</td>
                 </tr>
                 <tr>
                     <td class="center"><span class="label">Sous-réseaux</span></td>
                     <td>
-                        {% if object.ipv4_endpoint or object.ipv6_endpoint %}<ul>
-                            {% for subnet in object.administrative_subscription.ip_subnet.all %}<li>{{ subnet }}</li>{% endfor %}
-                        </ul>{% else %}<span class="italic">Aucune adresse</span>{% endif %}
+                        {% for subnet in object.administrative_subscription.ip_subnet.all %}{{ subnet }}<br/>{% endfor %}
                     </td>
                 </tr>
+              <tr><td class="center" colspan="2"><input type="submit" value="Valider" /></td></tr>
             </table>
         </div>
     </div>
+    </form>
 </div>
 
 <div class="row">

coin/vpn/views.py

@@ -4,6 +4,7 @@ from urllib2 import urlopen
 from django.http import StreamingHttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
 from django.views.generic.detail import DetailView
+from django.views.generic.edit import UpdateView
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
@@ -12,7 +13,9 @@ from coin.members.models import Member
 from coin.vpn.models import VPNConfiguration
 
 
-class VPNView(DetailView):
+class VPNView(UpdateView):
+    model = VPNConfiguration
+    fields = ['ipv4_endpoint', 'ipv6_endpoint', 'comment']
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):