add

BeHub/Hub/models.py

@@ -41,7 +41,7 @@ class BeaconManager(models.Model):
 
 class UserProject(models.Model):
     author = models.ForeignKey(User)
-    beacons = models.ManyToManyField('Beacon', null=True)
+    beacon_managers = models.ManyToManyField('BeaconManager', null=True)
     name = models.CharField(max_length=300)
     description = models.CharField(max_length=300, null=True)
 

BeHub/Hub/serializers.py

@@ -20,7 +20,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
 class UserProjectSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = UserProject
-        fields = ('id', 'url', 'author', 'beacons', 'name', 'description')
+        fields = ('id', 'url', 'author', 'beacon_managers', 'name', 'description')
 
 
 class BeaconSerializer(serializers.HyperlinkedModelSerializer):

BeHub/Hub/templates/user_panel/content/beacon_detail.html

@@ -5,7 +5,7 @@
     <tbody>
       <tr>
         <td class="col-md-2">{{ beacon.name }}</td>
-        <td>Doe
+        <td>Link
 
         </td>
       </tr>

BeHub/Hub/views.py

@@ -128,9 +128,17 @@ def project(request, project_id):
     data = {}
     user_project = UserProject.objects.get(id=project_id)
     user_project_serializer = UserProjectSerializer(user_project, context={'request': request})
-    beacons_serializer = BeaconSerializer(user_project.beacons, many=True,context={'request': request})
-
     data['project_data'] = user_project_serializer.data
-    data['project_data']['beacons'] = beacons_serializer.data
+    data['project_id'] = project_id
+    #beacons_data
+    data['beacon_display']  = []
+    beacon_managers =  user_project.beacon_managers.all()
+    for beacon_manager in beacon_managers:
+        beacon_serializer = BeaconSerializer(beacon_manager.beacon,context={'request': request})
+        beacon_data = beacon_serializer.data
+        my_sites = beacon_manager.sites.filter(author=request.user.pk)
+        site_serializer = SiteSerializer(my_sites, many=True, context={'request': request})
+        sites_data = site_serializer.data
+        data['beacon_display'].append([beacon_data, sites_data])
 
     return render_to_response('user_panel/content/project.html', data, context)