Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
KawowyDzienniczek
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
Rafal
KawowyDzienniczek
Commits
a7a55a9f
Commit
a7a55a9f
authored
Jul 15, 2016
by
lizonr1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new user_promotions
parent
676998bc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
14 deletions
+1
-14
serializers.py
KawowyDzienniczek/App/user/serializers.py
+1
-2
views.py
KawowyDzienniczek/App/user/views.py
+0
-12
No files found.
KawowyDzienniczek/App/user/serializers.py
View file @
a7a55a9f
...
@@ -3,7 +3,7 @@ from django.contrib.auth.models import User
...
@@ -3,7 +3,7 @@ from django.contrib.auth.models import User
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
rest_framework
import
serializers
from
rest_framework
import
serializers
from
App.loyaltyMe.serializers
import
P
laceSerializer
,
P
romotionSerializer
from
App.loyaltyMe.serializers
import
PromotionSerializer
from
App.user.models
import
UserProfile
,
UserPromotion
from
App.user.models
import
UserProfile
,
UserPromotion
...
@@ -53,7 +53,6 @@ class AuthTokenSerializerByEmail(serializers.Serializer):
...
@@ -53,7 +53,6 @@ class AuthTokenSerializerByEmail(serializers.Serializer):
class
UserPromotionSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
UserPromotionSerializer
(
serializers
.
HyperlinkedModelSerializer
):
user
=
UserSerializer
()
user
=
UserSerializer
()
#place = PlaceSerializer()
promotion
=
PromotionSerializer
()
promotion
=
PromotionSerializer
()
class
Meta
:
class
Meta
:
...
...
KawowyDzienniczek/App/user/views.py
View file @
a7a55a9f
...
@@ -100,15 +100,3 @@ class UserPromotionViewSet(viewsets.ModelViewSet):
...
@@ -100,15 +100,3 @@ class UserPromotionViewSet(viewsets.ModelViewSet):
"""
"""
user
=
self
.
request
.
user
user
=
self
.
request
.
user
return
UserPromotion
.
objects
.
filter
(
user
=
user
)
return
UserPromotion
.
objects
.
filter
(
user
=
user
)
# def get_queryset(self):
# user = self.request.user
# return user.user_promotion_set.all()
# def list(self, request):
# user = request.user
# queryset = UserPromotion.objects.filter(user=user)
# page = self.paginate_queryset(queryset)
# serializer = UserPromotionSerializer(page, many=True, context={'request': request})
# return self.get_paginated_response(serializer.data)
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