Merge branch 'isp-multiple-technologies' of opi/coin into master

coin/isp_database/migrations/0011_auto_20170309_1247.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import multiselectfield.db.fields
+from coin.isp_database.models import TECHNOLOGIES
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('isp_database', '0010_ispinfo_phone_number'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='coveredarea',
+            name='technologies',
+            field=multiselectfield.db.fields.MultiSelectField(max_length=42, choices=TECHNOLOGIES),
+        ),
+    ]

coin/isp_database/models.py

@@ -8,6 +8,8 @@ from django.core.exceptions import ValidationError
 from localflavor.generic.models import IBANField, BICField
 from localflavor.fr.models import FRSIRETField
 
+from multiselectfield import MultiSelectField
+
 from coin.members.models import count_active_members
 from coin.offers.models import count_active_subscriptions
 from coin import utils
@@ -203,15 +205,15 @@ class ChatRoom(models.Model):
 
 class CoveredArea(models.Model):
     name = models.CharField(max_length=512)
-    # TODO: we must allow multiple values
-    technologies = models.CharField(choices=TECHNOLOGIES, max_length=16)
+
+    technologies = MultiSelectField(choices=TECHNOLOGIES, max_length=42)
     # TODO: find a geojson library
     #area =
     isp = models.ForeignKey(ISPInfo)
 
     def to_dict(self):
         return {"name": self.name,
-                "technologies": [self.technologies]}
+                "technologies": self.technologies}
 
 
 class BankInfo(models.Model):

requirements.txt

@@ -11,6 +11,7 @@ django-sendfile==0.3.10
 django-localflavor==1.1
 django-netfields>=0.4,<0.5
 django-ldapdb>=0.4.0,<5.0
+django-multiselectfield>=0.1.5
 feedparser
 six==1.10.0
 WeasyPrint==0.31