nyymix/muistox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean code

Browse source
This commit is contained in:
Nyymix 2025-04-05 18:02:51 +03:00
parent f3ec438305
commit 3f03eb95bc
6 changed files with 82 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

47
gallery/admin.py
View file

@ -11,7 +11,7 @@ from imagekit.processors import ResizeToFit
from gallery.models import Album, City, Location, Photo, Redir
# Thumbnail-luokka admin-näkymää varten
# Thumbnail spec for admin previews
class AdminThumbnailSpec(ImageSpec):
processors = [ResizeToFit(100, 100)]
format = 'JPEG'
@ -19,7 +19,7 @@ class AdminThumbnailSpec(ImageSpec):
def cached_admin_thumb(instance):
"""Palauttaa cachetetun thumbnailin, jos kuva on olemassa."""
"""Return cached thumbnail for admin display if photo exists."""
if instance.photo:
cached = ImageCacheFile(AdminThumbnailSpec(instance.photo))
cached.generate()
@ -27,7 +27,6 @@ def cached_admin_thumb(instance):
return None
# 🔹 RedirAdmin – uudelleenohjausten hallinta
class RedirAdmin(admin.ModelAdmin):
list_display = ('path', 'album', 'test_url')
search_fields = ('path',)
@ -36,21 +35,18 @@ class RedirAdmin(admin.ModelAdmin):
list_editable = ('album',)
def formfield_for_foreignkey(self, db_field, request, **kwargs):
"""Järjestää albumivalikon aakkosjärjestykseen."""
if db_field.name == "album":
kwargs["queryset"] = Album.objects.all().order_by('name')
return super().formfield_for_foreignkey(db_field, request, **kwargs)
def test_url(self, obj):
"""Luo linkin, jolla voi testata uudelleenohjauksen."""
"""Generate clickable test link for redirection."""
return format_html(
'<a href="/{}" target="_blank">http://nyymix.net/{}</a>',
obj.path, obj.path
'<a href="/{0}" target="_blank">http://nyymix.net/{0}</a>', obj.path
)
test_url.short_description = "Test Redirection"
# 🔹 CityAdmin – kaupunkien hallinta
class CityAdmin(admin.ModelAdmin):
list_display = ('name',)
search_fields = ('name',)
@ -58,16 +54,13 @@ class CityAdmin(admin.ModelAdmin):
list_per_page = 30
# 🔹 LocationAdmin – sijaintien hallinta
class LocationAdmin(admin.ModelAdmin):
list_display = ('city', 'place')
list_filter = ('city',)
ordering = ('city__name',)
search_fields = ('place', 'city__name',)
search_fields = ('place', 'city__name')
list_per_page = 30
# 🔹 AlbumAdmin – albumien hallinta
class AlbumAdmin(admin.ModelAdmin):
prepopulated_fields = {'slug': ('name',)}
list_display = ('name', 'location', 'album_date', 'is_public', 'upload_link', 'thumbnail')
@ -79,7 +72,7 @@ class AlbumAdmin(admin.ModelAdmin):
change_form_template = "admin/gallery/album/change_form.html"
def get_urls(self):
"""Lisää mukautetun URL-reitin valokuvien lataamiselle."""
"""Add custom upload route to admin."""
urls = super().get_urls()
custom_urls = [
path('<int:album_id>/upload/', self.admin_site.admin_view(self.upload_photos), name="gallery_album_upload"),
@ -87,9 +80,8 @@ class AlbumAdmin(admin.ModelAdmin):
return custom_urls + urls
def upload_photos(self, request, album_id, *args, **kwargs):
"""Käsittelee valokuvien lataamisen albumiin."""
"""Handle photo upload via admin UI."""
album = get_object_or_404(Album, id=album_id)
if request.method == 'POST' and request.FILES:
uploaded_files = request.FILES.getlist('photo')
if not uploaded_files:
@ -102,7 +94,7 @@ class AlbumAdmin(admin.ModelAdmin):
return render(request, 'admin/upload_photos.html', {'album': album})
def upload_link(self, obj):
"""Lisää 'Upload Photos' -painikkeen albumin muokkaussivulle."""
"""Show 'Upload Photos' button in album list."""
if obj.id:
url = reverse("admin:gallery_album_upload", kwargs={"album_id": obj.id})
return format_html('<a href="{}" class="button">Upload Photos</a>', url)
@ -110,7 +102,7 @@ class AlbumAdmin(admin.ModelAdmin):
upload_link.short_description = "Upload Photos"
def thumbnail(self, obj):
"""Näyttää albumin kansikuvan pikkukuvan."""
"""Show album cover thumbnail."""
if obj.cover and obj.cover.photo:
return format_html(
'<img src="{}" style="width: 50px; height: auto;"/>',
@ -120,7 +112,7 @@ class AlbumAdmin(admin.ModelAdmin):
thumbnail.short_description = "Thumbnail"
def cover_preview(self, obj):
"""Näyttää albumin kansikuvan suurempana esikatseluna."""
"""Preview full-size cover image in album admin page."""
if obj.cover and obj.cover.photo:
return format_html(
'<img src="{}" style="max-width: 300px; height: auto;"/>',
@ -130,22 +122,13 @@ class AlbumAdmin(admin.ModelAdmin):
cover_preview.short_description = "Cover Preview"
def formfield_for_foreignkey(self, db_field, request, **kwargs):
"""
Suodattaa 'cover'-valinnan niin, että se näyttää vain albumiin kuuluvat kuvat.
Uuden albumin luonnissa vaihtoehto pidetään tyhjänä.
"""
"""Limit cover image choices to photos in this album."""
if db_field.name == "cover":
# Jos albumia ollaan luomassa (ei pk:ta), ei anneta mitään vaihtoehtoja
if request.resolver_match.kwargs.get("object_id") is None:
kwargs["queryset"] = Photo.objects.none()
else:
# Haetaan vain nykyiseen albumiin kuuluvat kuvat
album_id = request.resolver_match.kwargs.get("object_id")
kwargs["queryset"] = Photo.objects.filter(album_id=album_id)
album_id = request.resolver_match.kwargs.get("object_id")
kwargs["queryset"] = Photo.objects.filter(album_id=album_id) if album_id else Photo.objects.none()
return super().formfield_for_foreignkey(db_field, request, **kwargs)
# 🔹 PhotoAdmin – kuvien hallinta
class PhotoAdmin(admin.ModelAdmin):
list_display = ('slug', 'album', 'is_favorite', 'admin_thumbnail')
list_display_links = ('slug',)
@ -157,9 +140,9 @@ class PhotoAdmin(admin.ModelAdmin):
list_editable = ('is_favorite',)
# 🔹 Rekisteröidään admin-paneeliin
# Register models in admin
admin.site.register(City, CityAdmin)
admin.site.register(Location, LocationAdmin)
admin.site.register(Album, AlbumAdmin)
admin.site.register(Photo, PhotoAdmin)
admin.site.register(Redir, RedirAdmin)
admin.site.register(Redir, RedirAdmin)