From dc8af3e535d0ecb8e564578b832e6cc6f0ffbe43 Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Fri, 25 Oct 2024 09:57:31 +0000 Subject: [PATCH] =?UTF-8?q?Bot=C3=B3n=20de=20publicaci=C3=B3n=20de=20pozo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JugarAlPadel/Dockerfile | 2 +- JugarAlPadel/K8S/Makefile.local | 2 +- JugarAlPadel/gestion_reservas/eventos/urls.py | 2 ++ .../gestion_reservas/eventos/views.py | 18 +++++++++++++++++- .../templates/eventos/detalle_evento.html | 19 +++++++++++++++++++ 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/JugarAlPadel/Dockerfile b/JugarAlPadel/Dockerfile index 7228ea6..511a6a2 100644 --- a/JugarAlPadel/Dockerfile +++ b/JugarAlPadel/Dockerfile @@ -46,7 +46,7 @@ RUN mkdir -p $APP_HOME WORKDIR $APP_HOME # install system dependencies -RUN apt-get update && apt-get install -y sqlite3 netcat +RUN apt-get update && apt-get install -y sqlite3 netcat vim COPY --from=builder /app/wheels /wheels COPY --from=builder /app/requirements.txt . diff --git a/JugarAlPadel/K8S/Makefile.local b/JugarAlPadel/K8S/Makefile.local index 18223f9..1806ec5 100644 --- a/JugarAlPadel/K8S/Makefile.local +++ b/JugarAlPadel/K8S/Makefile.local @@ -2,7 +2,7 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') export REGISTRY=localhost:30500 #export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.63 +export IMG_VERSION = 0.73 export IMG_NGINX_VERSION = 2.4 # limpia todo diff --git a/JugarAlPadel/gestion_reservas/eventos/urls.py b/JugarAlPadel/gestion_reservas/eventos/urls.py index 2a493cf..0d6fa22 100644 --- a/JugarAlPadel/gestion_reservas/eventos/urls.py +++ b/JugarAlPadel/gestion_reservas/eventos/urls.py @@ -11,6 +11,8 @@ urlpatterns = [ path('eventos/crear/', views.crear_evento, name='crear_evento'), # URL para crear un evento path('eventos/editar/', views.editar_evento, name='editar_evento'), # URL para crear un evento + path('publicar//', views.publicar_evento, name='publicar_evento'), + path('reservar//', views.reservar_evento, name='reservar_evento'), ] diff --git a/JugarAlPadel/gestion_reservas/eventos/views.py b/JugarAlPadel/gestion_reservas/eventos/views.py index 5507875..3d485f7 100644 --- a/JugarAlPadel/gestion_reservas/eventos/views.py +++ b/JugarAlPadel/gestion_reservas/eventos/views.py @@ -59,6 +59,20 @@ def reservar_evento(request, evento_id): return redirect('eventos:lista_eventos') +@user_passes_test(lambda u: u.is_staff) +def publicar_evento(request, evento_id): + evento = get_object_or_404(Evento, id=evento_id) + + if not evento.publicado: + evento.publicado = True + evento.save() + messages.success(request, 'El evento %s ha sido publicado' % evento.nombre) + else: + messages.info(request, 'El evento %s ya está publicado' % evento.nombre) + + return redirect('eventos:detalle_evento', evento_id=evento_id) + + @login_required def lista_eventos(request): # Solo mostrar los eventos publicados a los usuarios normales @@ -95,7 +109,9 @@ def lista_eventos(request): def principal(request): - return render(request, 'eventos/lista_eventos.html') + eventos = Evento.objects.all() + + return render(request, 'eventos/lista_eventos.html', {'eventos': eventos}) def ayuda(request): diff --git a/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html b/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html index 3db1ed0..4eccccf 100644 --- a/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html +++ b/JugarAlPadel/gestion_reservas/templates/eventos/detalle_evento.html @@ -6,6 +6,21 @@ {% block content %}
+
+
+ {% if messages %} +
    + {% for message in messages %} + + {% endfor %} +
+ {% endif %} +
+
+ {% for evento in eventos %}
@@ -35,6 +50,10 @@ {% endif %} {% endif %} {% endif %} + + {% if user.is_staff and not evento.evento.publicado %} + Publicar + {% endif %}