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

BeHub/BeHub/urls.py

@@ -24,8 +24,8 @@ urlpatterns = patterns('',
     url(r'^project/(?P<project_id>\w+)/$', project),
     url(r'^api/', include(router.urls)),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^api/uuid/(?P<pk>[0-9]+)/$', hub_views.UuidBeaconViewSet.as_view()),
-    url(r'^api/uuid/(?P<pk>[0-9]+)/(?P<category_name>\w+)/$', hub_views.UuidBeaconViewSet.as_view()),
+    url(r'^api/uuid/(?P<pk>[\w\-]+)/$', hub_views.UuidBeaconViewSet.as_view()),
+    url(r'^api/uuid/(?P<pk>[\w\-]+)/(?P<category_name>\w+)/$', hub_views.UuidBeaconViewSet.as_view()),
 
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

BeHub/Hub/models.py

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