Remove extended models
This commit is contained in:
parent
3bc8a2b649
commit
8beedb3626
14 changed files with 66 additions and 155 deletions
|
|
@ -1,4 +1,5 @@
|
|||
from django.contrib import admin
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from .models import Gallery, Photo, Tag
|
||||
|
||||
|
|
@ -15,14 +16,19 @@ class GalleryAdmin(admin.ModelAdmin):
|
|||
|
||||
class PhotoAdmin(admin.ModelAdmin):
|
||||
list_display = ('title', 'date_taken', 'date_added',
|
||||
'is_public', 'view_count', 'admin_thumbnail')
|
||||
list_filter = ['date_added', 'is_public']
|
||||
'is_public', 'view_count', 'admin_thumbnail', 'get_owner')
|
||||
list_filter = ['date_added', 'is_public', 'owner']
|
||||
search_fields = ['title', 'slug', 'caption']
|
||||
list_per_page = 10
|
||||
prepopulated_fields = {'slug': ('title',)}
|
||||
readonly_fields = ('date_taken',)
|
||||
model = Photo
|
||||
|
||||
def get_owner(self, obj):
|
||||
return obj.owner.username
|
||||
get_owner.admin_order_field = 'owner'
|
||||
get_owner.short_description = _('owner')
|
||||
|
||||
|
||||
class TagAdmin(admin.ModelAdmin):
|
||||
list_display = ('name',)
|
||||
|
|
@ -30,4 +36,6 @@ class TagAdmin(admin.ModelAdmin):
|
|||
model = Tag
|
||||
|
||||
|
||||
admin.site.register(Gallery, GalleryAdmin)
|
||||
admin.site.register(Photo, PhotoAdmin)
|
||||
admin.site.register(Tag, TagAdmin)
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ class Gallery(models.Model):
|
|||
verbose_name_plural = _('galleries')
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
return f"{ self.title } ({self.date_start})"
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse('photologue:pl-gallery', args=[self.slug])
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from .models import Gallery, Photo
|
|||
|
||||
class GalleryDateView(LoginRequiredMixin):
|
||||
queryset = Gallery.objects.filter(is_public=True)
|
||||
date_field = 'extended__date_start'
|
||||
date_field = 'date_start'
|
||||
uses_datetime_field = False # Fix related object access
|
||||
allow_empty = True
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue