Skip to content

Commit

Permalink
Tags has been fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
SuzuMikhail committed Mar 16, 2020
1 parent 67437de commit d459eaf
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 25 deletions.
7 changes: 1 addition & 6 deletions myfav_lite_server/api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ class CategoryEntry(models.Model):
name = models.CharField(max_length=255, blank=False)
links = models.ManyToManyField('LinkEntry', blank=True)

class TagEntry(TaggedItemBase):
#name = models.CharField(max_length=25, blank=False)
content_object = models.CharField(max_length=25, blank=False)

class LinkEntry(models.Model):
category_name = models.ForeignKey(
CategoryEntry,
Expand All @@ -39,5 +35,4 @@ class LinkEntry(models.Model):
blank=True
)
public_date = models.DateTimeField('date published')
#tags = models.ManyToManyField('TagEntry')
tags = TaggableManager(through=TagEntry, blank=True)
tags = TaggableManager(blank=True)
13 changes: 4 additions & 9 deletions myfav_lite_server/api/serializers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from django.contrib.auth.models import User
from rest_framework import serializers
from taggit_serializer.serializers import TagListSerializerField, TaggitSerializer

from api.models import CategoryEntry, LinkEntry, TagEntry
from api.models import CategoryEntry, LinkEntry

class UserSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
Expand All @@ -16,14 +17,8 @@ class Meta:
fields = ('url', 'owner', 'name', 'links')


class TagEntrySerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = TagEntry
fields = ('url', 'content_object')

class LinkEntrySerializer(serializers.HyperlinkedModelSerializer):
#tags = serializers.StringRelatedField(many=True, read_only=True)
tags = TagEntrySerializer(read_only=True, many=True)
class LinkEntrySerializer(TaggitSerializer, serializers.ModelSerializer):
tags = TagListSerializerField()

class Meta:
model = LinkEntry
Expand Down
1 change: 0 additions & 1 deletion myfav_lite_server/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
router.register(r'users', views.UserViewSet)
router.register(r'link', views.LinkEntryViewSet)
router.register(r'category', views.CategoryEntryViewSet)
router.register(r'tag', views.TagEntryViewSet)

urlpatterns = [
url(r'^', include(router.urls)),
Expand Down
8 changes: 2 additions & 6 deletions myfav_lite_server/api/views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from django.contrib.auth.models import User
from rest_framework import viewsets
from api.serializers import UserSerializer, LinkEntrySerializer, CategorySerializer, TagEntrySerializer
from api.serializers import UserSerializer, LinkEntrySerializer, CategorySerializer

from api.models import LinkEntry, CategoryEntry, TagEntry
from api.models import LinkEntry, CategoryEntry

# Create your views here.

Expand All @@ -17,7 +17,3 @@ class LinkEntryViewSet(viewsets.ModelViewSet):
class CategoryEntryViewSet(viewsets.ModelViewSet):
queryset = CategoryEntry.objects.all()
serializer_class = CategorySerializer

class TagEntryViewSet(viewsets.ModelViewSet):
queryset = TagEntry.objects.all()
serializer_class = TagEntrySerializer
3 changes: 0 additions & 3 deletions myfav_lite_server/bash.exe.stackdump

This file was deleted.

1 change: 1 addition & 0 deletions myfav_lite_server/myfav/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

'rest_framework',
'taggit',
'taggit_serializer'
]

MIDDLEWARE = [
Expand Down
1 change: 1 addition & 0 deletions myfav_lite_server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Django==3.0.4
django-filter==2.2.0
django-taggit==1.2.0
django-taggit-serializer==0.1.7
djangorestframework==3.11.0
Markdown==3.2.1

0 comments on commit d459eaf

Please sign in to comment.