Fix urlpatterns

This commit is contained in:
Nyymix 2025-01-15 09:48:34 +02:00
parent dee6dcef3b
commit 89134993ad
3 changed files with 4 additions and 29 deletions

View file

@ -1,26 +1,10 @@
"""
URL configuration for config project.
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/5.1/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import include, path
urlpatterns = [
path("", include("gallery.urls")),
path('', include(('gallery.urls', 'gallery'), namespace='gallery')),
path('admin/', admin.site.urls),
]

View file

@ -52,7 +52,7 @@ class Photo(models.Model):
super().save(*args, **kwargs)
def get_absolute_url(self):
return reverse('gallery:photo_url', kwargs={'album_path': self.album.slug, 'photo_slug': self.slug})
return reverse('gallery:photo_url', kwargs={'album_slug': self.album.slug, 'photo_slug': self.slug})
def __str__(self):
return f'{self.slug} ({self.album.name})'

View file

@ -6,19 +6,10 @@ app_name = 'gallery'
urlpatterns = [
# Main page
path('', views.Main.as_view(), name='main_url'),
# Top kuvat
path('photostream/', views.PhotosList.as_view(), name='photos_url'),
# Yksittäinen kuva albumissa:
path('albums/<path:album_path>/<int:photo_slug>/', views.PhotoDetail.as_view(), name="photo_url"),
# Albumin yksityiskohdat:
path('albums/<path:album_slug>/', views.AlbumDetail.as_view(), name="album_url"),
# Albumien lista:
path('albums/<path:album_slug>/<int:photo_slug>/', views.PhotoDetail.as_view(), name='photo_url'),
path('albums/<path:album_slug>/', views.AlbumDetail.as_view(), name='album_url'),
path('albums/', views.AlbumsList.as_view(), name='albums_url'),
]