Add tags to galleries
This commit is contained in:
parent
d74e6e39f9
commit
7d700bea36
9 changed files with 81 additions and 11 deletions
|
|
@ -44,6 +44,7 @@ INSTALLED_APPS = [
|
|||
'photologue_custom',
|
||||
'photologue',
|
||||
'sortedm2m',
|
||||
'taggit',
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
|
|
|
|||
|
|
@ -1,3 +1,22 @@
|
|||
from django.contrib import admin
|
||||
from photologue.admin import GalleryAdmin as GalleryAdminDefault
|
||||
from photologue.models import Gallery
|
||||
|
||||
# Register your models here.
|
||||
from .models import GalleryExtended
|
||||
|
||||
|
||||
class GalleryExtendedInline(admin.StackedInline):
|
||||
model = GalleryExtended
|
||||
can_delete = False
|
||||
|
||||
|
||||
class GalleryAdmin(GalleryAdminDefault):
|
||||
"""
|
||||
Define our new one-to-one model as an inline of Photologue's Gallery
|
||||
model.
|
||||
"""
|
||||
inlines = [GalleryExtendedInline, ]
|
||||
|
||||
|
||||
admin.site.unregister(Gallery)
|
||||
admin.site.register(Gallery, GalleryAdmin)
|
||||
|
|
|
|||
29
photologue_custom/migrations/0001_initial.py
Normal file
29
photologue_custom/migrations/0001_initial.py
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# Generated by Django 2.2.24 on 2021-09-23 08:26
|
||||
|
||||
from django.db import migrations, models
|
||||
import taggit.managers
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
('taggit', '0003_taggeditem_add_unique_index'),
|
||||
('photologue', '0011_auto_20190223_2138'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='GalleryExtended',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('gallery', models.OneToOneField(on_delete='cascade', related_name='extended', to='photologue.Gallery')),
|
||||
('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Extra fields',
|
||||
'verbose_name_plural': 'Extra fields',
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -1,3 +1,22 @@
|
|||
from django.db import models
|
||||
from taggit.managers import TaggableManager
|
||||
from photologue.models import Gallery
|
||||
|
||||
# Create your models here.
|
||||
|
||||
class GalleryExtended(models.Model):
|
||||
# Extend Photologue Gallery model.
|
||||
gallery = models.OneToOneField(
|
||||
Gallery,
|
||||
related_name='extended',
|
||||
on_delete='cascade',
|
||||
)
|
||||
|
||||
# Add tags
|
||||
tags = TaggableManager(blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = u'Extra fields'
|
||||
verbose_name_plural = u'Extra fields'
|
||||
|
||||
def __str__(self):
|
||||
return self.gallery.title
|
||||
|
|
|
|||
|
|
@ -23,6 +23,13 @@
|
|||
{% block content %}
|
||||
<h1>{{ gallery.title }}</h1>
|
||||
<p class="text-muted small">{% trans "Published" %} {{ gallery.date_added }}</p>
|
||||
{% if gallery.extended.tags.all %}
|
||||
<p class="text-muted">
|
||||
Tags : {% for tag in gallery.extended.tags.all %}
|
||||
<span class="badge rounded-pill bg-dark">{{ tag }}</span>
|
||||
{% endfor %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if gallery.description %}<p>{{ gallery.description|safe }}</p>{% endif %}
|
||||
<div class="gallery-list mb-3" id="lightgallery">
|
||||
{% for photo in gallery.public %}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
Django~=2.2.20
|
||||
django-photologue~=3.13
|
||||
django-photologue~=3.13
|
||||
django-taggit~=1.5.1
|
||||
|
|
|
|||
4
tox.ini
4
tox.ini
|
|
@ -18,7 +18,7 @@ deps =
|
|||
-r{toxinidir}/requirements.txt
|
||||
coverage
|
||||
commands =
|
||||
coverage run --omit='photo21/wsgi.py' --source=photo21 ./manage.py test
|
||||
coverage run --omit='photo21/wsgi.py' --source=photo21,photologue_custom ./manage.py test
|
||||
coverage report -m
|
||||
|
||||
[testenv:linters]
|
||||
|
|
@ -32,7 +32,7 @@ deps =
|
|||
pep8-naming
|
||||
pyflakes
|
||||
commands =
|
||||
flake8 photo21
|
||||
flake8 photo21 photologue_custom
|
||||
|
||||
[flake8]
|
||||
ignore = W503, I100, I101
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue