Commit 47a56d37 authored by Ilya Simonov's avatar Ilya Simonov

add tags models

parent 3d63ed0e
...@@ -21,7 +21,7 @@ Thumbs.db ...@@ -21,7 +21,7 @@ Thumbs.db
.redis-stable .redis-stable
# Python # Python
__pycache__ __pycache__/
*.pyc *.pyc
# Development # Development
......
from django.contrib import admin from django.contrib import admin
from django.contrib.contenttypes.admin import GenericTabularInline
from . import models from . import models
class TagAdmin(admin.ModelAdmin):
list_display = ['id', 'name']
search_fields = ['name']
class TagToObjectAdmin(admin.ModelAdmin):
list_display = ['id', 'tag', 'object_id', 'content_type']
search_fields = ['tag__name', 'object_id', 'content_type__name']
autocomplete_fields = ['tag']
class TagInline(GenericTabularInline):
model = models.TagToObject
autocomplete_fields = ['tag']
extra = 0
verbose_name = 'Tag'
classes = ['collapse']
class VideoAdmin(admin.ModelAdmin): class VideoAdmin(admin.ModelAdmin):
list_display = ['id', 'title', 'slug', 'status', 'duration'] list_display = ['id', 'title', 'slug', 'status', 'duration']
readonly_fields = ['created', 'updated'] readonly_fields = ['created', 'updated']
list_filter = ('status',) list_filter = ('status',)
inlines = [TagInline]
def save_model(self, request, obj, form, change): def save_model(self, request, obj, form, change):
obj.creator = request.user obj.creator = request.user
...@@ -25,3 +46,5 @@ class CategoryAdmin(admin.ModelAdmin): ...@@ -25,3 +46,5 @@ class CategoryAdmin(admin.ModelAdmin):
admin.site.register(models.Video, VideoAdmin) admin.site.register(models.Video, VideoAdmin)
admin.site.register(models.Playlist, PlayListAdmin) admin.site.register(models.Playlist, PlayListAdmin)
admin.site.register(models.Category, CategoryAdmin) admin.site.register(models.Category, CategoryAdmin)
admin.site.register(models.Tag, TagAdmin)
admin.site.register(models.TagToObject, TagToObjectAdmin)
# Generated by Django 4.1.7 on 2023-03-06 14:07 # Generated by Django 4.1.7 on 2023-03-06 16:31
import apps.core.utils import apps.core.utils
from django.conf import settings from django.conf import settings
...@@ -11,6 +11,7 @@ class Migration(migrations.Migration): ...@@ -11,6 +11,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('contenttypes', '0002_remove_content_type_name'),
('core', '0001_initial'), ('core', '0001_initial'),
] ]
...@@ -21,6 +22,27 @@ class Migration(migrations.Migration): ...@@ -21,6 +22,27 @@ class Migration(migrations.Migration):
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(db_index=True, max_length=255, verbose_name='name')), ('name', models.CharField(db_index=True, max_length=255, verbose_name='name')),
], ],
options={
'verbose_name': 'Category',
'verbose_name_plural': 'Categories',
'ordering': ('name',),
},
),
migrations.CreateModel(
name='Tag',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(db_index=True, max_length=255, verbose_name='name')),
],
options={
'verbose_name': 'Tag',
'verbose_name_plural': 'Tags',
'ordering': ('name',),
},
),
migrations.AlterModelOptions(
name='video',
options={'ordering': ('title',), 'verbose_name': 'Video', 'verbose_name_plural': 'Videos'},
), ),
migrations.AddField( migrations.AddField(
model_name='video', model_name='video',
...@@ -73,6 +95,19 @@ class Migration(migrations.Migration): ...@@ -73,6 +95,19 @@ class Migration(migrations.Migration):
name='title', name='title',
field=models.CharField(max_length=255, verbose_name='title'), field=models.CharField(max_length=255, verbose_name='title'),
), ),
migrations.CreateModel(
name='TagToObject',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('object_id', models.PositiveIntegerField(blank=True, null=True, verbose_name='object_id')),
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='content_type_tag', to='contenttypes.contenttype', verbose_name='content type')),
('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tag', to='core.tag')),
],
options={
'verbose_name': 'Tag to object',
'verbose_name_plural': 'Tags to objects',
},
),
migrations.CreateModel( migrations.CreateModel(
name='Playlist', name='Playlist',
fields=[ fields=[
...@@ -84,6 +119,8 @@ class Migration(migrations.Migration): ...@@ -84,6 +119,8 @@ class Migration(migrations.Migration):
('videos', models.ManyToManyField(related_name='playlist', to='core.video')), ('videos', models.ManyToManyField(related_name='playlist', to='core.video')),
], ],
options={ options={
'verbose_name': 'Playlist',
'verbose_name_plural': 'Playlists',
'ordering': ('title',), 'ordering': ('title',),
}, },
), ),
......
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
from pytils.translit import slugify from pytils.translit import slugify
...@@ -27,9 +29,45 @@ class BaseModel(models.Model): ...@@ -27,9 +29,45 @@ class BaseModel(models.Model):
abstract = True abstract = True
class Tag(models.Model):
name = models.CharField(_('name'), max_length=255, db_index=True)
class Meta:
ordering = ('name',)
verbose_name = 'Tag'
verbose_name_plural = 'Tags'
def __str__(self):
return self.name
class TagToObject(models.Model):
tag = models.ForeignKey(Tag, on_delete=models.CASCADE, related_name='tag')
content_type = models.ForeignKey(
ContentType,
on_delete=models.CASCADE,
related_name='content_type_tag',
verbose_name=_('content type'),
)
object_id = models.PositiveIntegerField(_('object_id'), blank=True, null=True)
content_object = GenericForeignKey('content_type', 'object_id')
class Meta:
verbose_name = 'Tag to object'
verbose_name_plural = 'Tags to objects'
def __str__(self):
return str(self.id)
class Category(models.Model): class Category(models.Model):
name = models.CharField('name', max_length=255, db_index=True) name = models.CharField('name', max_length=255, db_index=True)
class Meta:
ordering = ('name',)
verbose_name = 'Category'
verbose_name_plural = 'Categories'
def __str__(self): def __str__(self):
return self.name return self.name
...@@ -85,9 +123,12 @@ class Video(BaseModel): ...@@ -85,9 +123,12 @@ class Video(BaseModel):
related_name='video', related_name='video',
blank=True, blank=True,
) )
tags = GenericRelation(TagToObject)
class Meta: class Meta:
ordering = ('title',) ordering = ('title',)
verbose_name = 'Video'
verbose_name_plural = 'Videos'
def __str__(self): def __str__(self):
return self.title return self.title
...@@ -103,9 +144,12 @@ class Playlist(BaseModel): ...@@ -103,9 +144,12 @@ class Playlist(BaseModel):
title = models.CharField(_('title'), max_length=255) title = models.CharField(_('title'), max_length=255)
description = models.TextField(_('description'), blank=True, null=True) description = models.TextField(_('description'), blank=True, null=True)
videos = models.ManyToManyField(Video, related_name='playlist') videos = models.ManyToManyField(Video, related_name='playlist')
tags = GenericRelation(TagToObject)
class Meta: class Meta:
ordering = ('title',) ordering = ('title',)
verbose_name = 'Playlist'
verbose_name_plural = 'Playlists'
def __str__(self): def __str__(self):
return self.title return self.title
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment