Merge remote-tracking branch 'origin/master'

BeHub/Hub/models.py

@@ -32,7 +32,7 @@ class Beacon(models.Model):
 
 class BeaconManager(models.Model):
     beacon = models.OneToOneField('Beacon')
-    sites = models.ManyToManyField('Site')
+    sites = models.ManyToManyField('Site', blank=True)
 
     def __str__(self):
         return str(self.beacon)

BeHub/Hub/views.py

@@ -56,10 +56,16 @@ class UuidBeaconViewSet(APIView):
                 site = beacon_manager.sites.get(category=category)
             except ObjectDoesNotExist:
                 return Response(status=rest_framework.status.HTTP_400_BAD_REQUEST, data={"Any link do not have this category"})
-            serializer = SiteSerializer(site, context={'request': request})
-            return Response(serializer.data)
-        serializer = SiteSerializer(beacon_manager.sites, many=True, context={'request': request})
-        return Response(serializer.data)
+            serializer_sites = SiteSerializer(site, context={'request': request})
+        else:
+            serializer_sites = SiteSerializer(beacon_manager.sites, many=True, context={'request': request})
+
+        serializer = BeaconManagerSerializer(beacon_manager, context={'request': request})
+        serializer_data = serializer.data
+        serializer_beacon = BeaconSerializer(beacon_manager.beacon, context={'request': request})
+        serializer_data['sites'] = serializer_sites.data
+        serializer_data['beacon'] = serializer_beacon.data
+        return Response(serializer_data)
 
 class CategoryViewSet(viewsets.ModelViewSet):
     """