From e0375ad8451c5f2dcb4e1d72447c2b417c75e9c8 Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Wed, 16 Apr 2025 09:03:48 +0200 Subject: [PATCH] =?UTF-8?q?Car=C3=A1tulas=20de=20albumes=20en=20detalle=20?= =?UTF-8?q?de=20artista=20y=20ordenaci=C3=B3n=20de=20canciones=20por=20pis?= =?UTF-8?q?ta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- K8S/Makefile | 2 +- K8S/entraPsql.sh | 2 +- K8S/env-prod-configmap.yaml | 2 +- src/lyrics/views.py | 2 +- src/templates/lyrics/detalle_artista.html | 7 +++++++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/K8S/Makefile b/K8S/Makefile index 8a79e2a..a2e7187 100644 --- a/K8S/Makefile +++ b/K8S/Makefile @@ -1,6 +1,6 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.74 +export IMG_VERSION = 0.76 export IMG_NGINX_VERSION = 1.0 # limpia todo diff --git a/K8S/entraPsql.sh b/K8S/entraPsql.sh index 077b82f..571d2bd 100644 --- a/K8S/entraPsql.sh +++ b/K8S/entraPsql.sh @@ -1 +1 @@ -kubectl -n reymota exec -ti deployment.apps/db -- psql --username=creylopez --dbname=reymota +kubectl -n reymota exec -ti deployment.apps/postgresql -- psql --username=creylopez --dbname=reymota diff --git a/K8S/env-prod-configmap.yaml b/K8S/env-prod-configmap.yaml index 1a5aaa4..436b43f 100644 --- a/K8S/env-prod-configmap.yaml +++ b/K8S/env-prod-configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 data: DEBUG: "False" ENTORNO: "Producción" - APP_VERSION: 15.0.1 + APP_VERSION: 15.0.3 SECRET_KEY: change_me SQL_HOST: postgresql SQL_PORT: "5432" diff --git a/src/lyrics/views.py b/src/lyrics/views.py index 1b6b5d7..452c2b9 100644 --- a/src/lyrics/views.py +++ b/src/lyrics/views.py @@ -81,7 +81,7 @@ def lista_albumes(request): @login_required def detalle_album(request, album_id): album = get_object_or_404(Album, pk=album_id) - songs = Song.objects.filter(album_id=album_id) + songs = Song.objects.filter(album_id=album_id).order_by("pista") return render(request, 'lyrics/detalle_album.html', {'album': album, 'songs': songs}) diff --git a/src/templates/lyrics/detalle_artista.html b/src/templates/lyrics/detalle_artista.html index 3b36342..70052c9 100644 --- a/src/templates/lyrics/detalle_artista.html +++ b/src/templates/lyrics/detalle_artista.html @@ -41,6 +41,13 @@ {% for album in albumes %} + + {% if album.cover_image %} + {{ album.name }} + {% else %} + Sin imágen + {% endif %} + {{ album.name }} {{ album.artist }} {{ album.year }}