Merge branch 'master' of gitlab.telemabk.pl:dominik/BeHub-web

BeHub/BeHub/urls.py

@@ -10,7 +10,6 @@ from Hub.views import login_page, main_page, dashboard, project, beacons
 router = routers.DefaultRouter()
 router.register(r'beacons', hub_views.BeaconViewSet)
 router.register(r'beacon_managers', hub_views.BeaconManagerViewSet)
-router.register(r'full_beacon_managers', hub_views.FullBeaconManagerViewSet)
 router.register(r'category', hub_views.CategoryViewSet)
 router.register(r'sites', hub_views.SiteViewSet)
 router.register(r'uuid', hub_views.UuidBeaconViewSet)

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

@@ -55,7 +55,7 @@
 
     $("#myModal").modal("show");
     $("#modal-content").html('<form action="/login/" method="post" class="form-signin">\
-                <input id="name" type="text" class="form-control" placeholder="Nazwa projektu" required autofocus name="name">\
+                <input id="name" type="text" class="form-control" placeholder="Nazwa beacona" required autofocus name="name">\
                 <input id="desc" type="text" class="form-control" placeholder="Description" required autofocus name="desc">\
                 <input id="uuid" type="text" class="form-control" placeholder="UUID" required autofocus name="uuid">\
                 <input id="long" type="text" class="form-control" placeholder="Longitude" required autofocus name="long">\
@@ -63,7 +63,7 @@
     </form>');
 
     $("#modal-footer").html('<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>\
-        <button type="button" class="btn btn-primary" id="addProjectBtn">Add project</button>');
+        <button type="button" class="btn btn-primary" id="addProjectBtn">Add beacon</button>');
 
     $("#addProjectBtn").off("click");
     $("#addProjectBtn").on("click", function(){

BeHub/Hub/views.py

@@ -39,12 +39,12 @@ class BeaconManagerViewSet(viewsets.ModelViewSet):
     queryset = BeaconManager.objects.all()
     serializer_class = BeaconManagerSerializer
 
-class FullBeaconManagerViewSet(viewsets.ModelViewSet):
-    """
-    API for places
-    """
-    queryset = BeaconManager.objects.all()
-    serializer_class = FullBeaconManagerSerializer
+# class FullBeaconManagerViewSet(viewsets.ModelViewSet):
+#     """
+#     API for places
+#     """
+#     queryset = BeaconManager.objects.all()
+#     serializer_class = FullBeaconManagerSerializer
 
 
 class UserProjectViewSet(viewsets.ModelViewSet):