diff --git a/gallery/admin.py b/gallery/admin.py index 0c23b74..e671ec5 100644 --- a/gallery/admin.py +++ b/gallery/admin.py @@ -61,6 +61,7 @@ class LocationAdmin(admin.ModelAdmin): search_fields = ('place', 'city__name') list_per_page = 30 + class AlbumAdmin(admin.ModelAdmin): prepopulated_fields = {'slug': ('name',)} list_display = ('name', 'location', 'album_date', 'is_public', 'upload_link', 'thumbnail') @@ -145,4 +146,4 @@ 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) \ No newline at end of file +admin.site.register(Redir, RedirAdmin) diff --git a/gallery/context_processors.py b/gallery/context_processors.py index c7a7d46..5c38e85 100644 --- a/gallery/context_processors.py +++ b/gallery/context_processors.py @@ -13,9 +13,8 @@ def site_config(request): try: with open(config_path, 'r') as f: config = json.load(f) - cache.set('site_config', config, 3600) + cache.set('site_config', config, 3600) except FileNotFoundError: config = {} return {'site_config': config} - diff --git a/gallery/models/album.py b/gallery/models/album.py index 97310bb..a4062fc 100644 --- a/gallery/models/album.py +++ b/gallery/models/album.py @@ -65,4 +65,4 @@ class Album(models.Model): @receiver(post_save, sender=Album) def delete_album_cover_cache(sender, instance, **kwargs): - cache.delete(f'cover_image_data_{instance.pk}') \ No newline at end of file + cache.delete(f'photo_md_image_data_{instance.pk}') diff --git a/gallery/models/location.py b/gallery/models/location.py index 7338d60..f6772a8 100644 --- a/gallery/models/location.py +++ b/gallery/models/location.py @@ -20,7 +20,6 @@ class Location(models.Model): unique_together = ('place', "city") ordering = ['city'] - def __str__(self): if self.place: return '{0}, {1}'.format(self.city, self.place) diff --git a/gallery/models/photo.py b/gallery/models/photo.py index 76f455e..9c34cce 100644 --- a/gallery/models/photo.py +++ b/gallery/models/photo.py @@ -38,10 +38,10 @@ class Photo(models.Model): @property def orientation(self): return "Portrait" if self.height > self.width else "Landscape" - + @property def aspect_ratio(self): - return self.width / self.height + return self.width / self.height def save(self, *args, **kwargs): if not self.slug: @@ -59,7 +59,7 @@ class Photo(models.Model): def get_next(self): return self.__class__.objects.filter(taken_at__gt=self.taken_at, album=self.album).order_by('taken_at').first() - + def get_prev(self): return self.__class__.objects.filter(taken_at__lt=self.taken_at, album=self.album).order_by('-taken_at').first() @@ -77,7 +77,6 @@ class Photo(models.Model): def __str__(self): return f'{self.slug} ({self.orientation}) {self.is_favorite}' - @receiver(post_save, sender=Photo) @@ -95,4 +94,4 @@ def handle_photo_creation(sender, instance, created, **kwargs): # Aseta cover, jos albumilla ei ole vielä sellaista if instance.album and not instance.album.cover: instance.album.cover = instance - instance.album.save(update_fields=['cover']) \ No newline at end of file + instance.album.save(update_fields=['cover']) diff --git a/gallery/sitemaps.py b/gallery/sitemaps.py index cf2e3a9..a6a0f3e 100644 --- a/gallery/sitemaps.py +++ b/gallery/sitemaps.py @@ -15,4 +15,4 @@ class AlbumSitemap(Sitemap): return obj.album_date def location(self, obj): - return reverse('gallery:album_url', kwargs={'album_slug': obj.slug}) \ No newline at end of file + return reverse('gallery:album_url', kwargs={'album_slug': obj.slug}) diff --git a/gallery/templates/gallery/album_list.html b/gallery/templates/gallery/album_list.html index 2c47d64..40d6655 100644 --- a/gallery/templates/gallery/album_list.html +++ b/gallery/templates/gallery/album_list.html @@ -30,15 +30,19 @@
diff --git a/gallery/templates/gallery/album_search.html b/gallery/templates/gallery/album_search.html index 1026350..fd13000 100644 --- a/gallery/templates/gallery/album_search.html +++ b/gallery/templates/gallery/album_search.html @@ -31,15 +31,19 @@ diff --git a/gallery/templates/gallery/main.html b/gallery/templates/gallery/main.html index 9b56b01..cacd2fb 100644 --- a/gallery/templates/gallery/main.html +++ b/gallery/templates/gallery/main.html @@ -15,6 +15,7 @@ {% load top_tags %} + {% load image_tags %} {% random_favorite_photos_portrait 10 as top_portrait_photos %} {% if top_portrait_photos %} @@ -22,11 +23,13 @@