Merge branch 'master' of git.illyse.org:coin

coin/resources/models.py

@@ -15,15 +15,13 @@ class IPPool(models.Model):
     inet = CidrAddressField()
     objects = NetManager()
 
-    def clean_default_subnetsize(self):
-        if self.inet.version == 4:
+    def clean(self):
+        if self.inet is not None and self.inet.version == 4:
             if not self.inet.prefixlen <= self.default_subnetsize <= 32:
                 raise ValidationError('Invalid default subnet size')
-        elif self.inet.version == 6:
+        elif self.inet is not None and self.inet.version == 6:
             if not self.inet.prefixlen <= self.default_subnetsize <= 64:
                 raise ValidationError('Invalid default subnet size')
-        else:
-            pass
 
     def __unicode__(self):
         return self.name

coin/templates/base.html

@@ -31,7 +31,7 @@
          <li {% if request.get_full_path = "/members/" %}class="active"{% endif %}><a href="/members/">Tableau de bord</a></li>
          <li {% if request.get_full_path = "/members/info/" %}class="active"{% endif %} ><a href="/members/info/">Mes informations personnelles</a></li>
          <li {% if request.get_full_path = "/members/abo/" %}class="active"{% endif %}><a href="/members/abo/">Mes abonnements</a></li>
-         <li {% if request.get_full_path = "/members/contact/" %}class="active"{% endif %}><a href="/members/abo/">Contact / Support</a></li>
+         <li {% if request.get_full_path = "/members/contact/" %}class="active"{% endif %}><a href="/members/contact/">Contact / Support</a></li>
      </ul>
      </nav>
      {% endblock %}