Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
BeHub-web
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dominik Rosiek
BeHub-web
Commits
1a59648b
Commit
1a59648b
authored
Nov 22, 2015
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add user project
parent
6cfb7fb6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
4 deletions
+19
-4
urls.py
BeHub/BeHub/urls.py
+1
-0
models.py
BeHub/Hub/models.py
+1
-1
serializers.py
BeHub/Hub/serializers.py
+7
-1
views.py
BeHub/Hub/views.py
+10
-2
No files found.
BeHub/BeHub/urls.py
View file @
1a59648b
...
@@ -14,6 +14,7 @@ router.register(r'category', hub_views.CategoryViewSet)
...
@@ -14,6 +14,7 @@ router.register(r'category', hub_views.CategoryViewSet)
router
.
register
(
r'sites'
,
hub_views
.
SiteViewSet
)
router
.
register
(
r'sites'
,
hub_views
.
SiteViewSet
)
router
.
register
(
r'uuid'
,
hub_views
.
UuidBeaconViewSet
)
router
.
register
(
r'uuid'
,
hub_views
.
UuidBeaconViewSet
)
router
.
register
(
r'users'
,
hub_views
.
UserViewSet
)
router
.
register
(
r'users'
,
hub_views
.
UserViewSet
)
router
.
register
(
r'user_project'
,
hub_views
.
UserProjectViewSet
)
urlpatterns
=
patterns
(
''
,
urlpatterns
=
patterns
(
''
,
...
...
BeHub/Hub/models.py
View file @
1a59648b
...
@@ -40,7 +40,7 @@ class BeaconManager(models.Model):
...
@@ -40,7 +40,7 @@ class BeaconManager(models.Model):
return
str
(
self
.
beacon
)
return
str
(
self
.
beacon
)
class
UserProject
(
models
.
Model
):
class
UserProject
(
models
.
Model
):
author
=
models
.
ForeignKey
(
User
)
author
=
models
.
ForeignKey
(
User
,
unique
=
True
)
beacons
=
models
.
ManyToManyField
(
'Beacon'
)
beacons
=
models
.
ManyToManyField
(
'Beacon'
)
name
=
models
.
CharField
(
max_length
=
300
)
name
=
models
.
CharField
(
max_length
=
300
)
description
=
models
.
CharField
(
max_length
=
300
,
null
=
True
)
description
=
models
.
CharField
(
max_length
=
300
,
null
=
True
)
...
...
BeHub/Hub/serializers.py
View file @
1a59648b
from
rest_framework
import
serializers
from
rest_framework
import
serializers
from
django.contrib.auth.models
import
User
from
django.contrib.auth.models
import
User
from
Hub.models
import
Beacon
,
BeaconManager
,
Category
,
Site
from
Hub.models
import
Beacon
,
BeaconManager
,
Category
,
Site
,
UserProject
class
SiteSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
SiteSerializer
(
serializers
.
HyperlinkedModelSerializer
):
...
@@ -17,6 +17,12 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
...
@@ -17,6 +17,12 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
fields
=
(
'id'
,
'url'
)
fields
=
(
'id'
,
'url'
)
class
UserProjectSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
model
=
UserProject
fields
=
(
'id'
,
'url'
,
'author'
,
'beacons'
,
'name'
,
'description'
)
class
BeaconSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
BeaconSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
class
Meta
:
...
...
BeHub/Hub/views.py
View file @
1a59648b
...
@@ -11,9 +11,9 @@ from rest_framework import viewsets
...
@@ -11,9 +11,9 @@ from rest_framework import viewsets
import
rest_framework
import
rest_framework
from
rest_framework.response
import
Response
from
rest_framework.response
import
Response
from
rest_framework.views
import
APIView
from
rest_framework.views
import
APIView
from
Hub.models
import
Beacon
,
BeaconManager
,
Site
,
Category
from
Hub.models
import
Beacon
,
BeaconManager
,
Site
,
Category
,
UserProject
from
Hub.serializers
import
BeaconSerializer
,
BeaconManagerSerializer
,
SiteSerializer
,
CategorySerializer
,
\
from
Hub.serializers
import
BeaconSerializer
,
BeaconManagerSerializer
,
SiteSerializer
,
CategorySerializer
,
\
UserSerializer
UserSerializer
,
UserProjectSerializer
class
BeaconViewSet
(
viewsets
.
ModelViewSet
):
class
BeaconViewSet
(
viewsets
.
ModelViewSet
):
...
@@ -38,6 +38,14 @@ class BeaconManagerViewSet(viewsets.ModelViewSet):
...
@@ -38,6 +38,14 @@ class BeaconManagerViewSet(viewsets.ModelViewSet):
queryset
=
BeaconManager
.
objects
.
all
()
queryset
=
BeaconManager
.
objects
.
all
()
serializer_class
=
BeaconManagerSerializer
serializer_class
=
BeaconManagerSerializer
class
UserProjectViewSet
(
viewsets
.
ModelViewSet
):
"""
API for places
"""
queryset
=
UserProject
.
objects
.
all
()
serializer_class
=
UserProjectSerializer
class
SiteViewSet
(
viewsets
.
ModelViewSet
):
class
SiteViewSet
(
viewsets
.
ModelViewSet
):
"""
"""
API for places
API for places
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment