Browse Source

Se añade canción desde vista de album y se pasan autor, nombre y se averigua número de pista a añadir.

politica
Celestino Rey 1 year ago
parent
commit
26b4254ffe
3 changed files with 15 additions and 14 deletions
  1. +1
    -2
      LyricsPy/K8S/Makefile
  2. +13
    -6
      LyricsPy/servicios/lyrics/paginas.py
  3. +1
    -6
      LyricsPy/servicios/lyrics/templates/add_song2album.html

+ 1
- 2
LyricsPy/K8S/Makefile View File

@ -1,5 +1,4 @@
export IMG_VERSION = 6.6
export IMG_VERSION = 6.7
imagen: imagen:
cd ../servicios; make cd ../servicios; make


+ 13
- 6
LyricsPy/servicios/lyrics/paginas.py View File

@ -1,6 +1,7 @@
from flask import Blueprint, render_template, request, redirect, url_for, current_app, send_from_directory from flask import Blueprint, render_template, request, redirect, url_for, current_app, send_from_directory
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from flask_login import login_user, logout_user, login_required from flask_login import login_user, logout_user, login_required
from sqlalchemy import desc
import os import os
@ -66,14 +67,20 @@ def add_song():
@bp.route('/add_song2album/<int:album_id>', methods=['GET', 'POST']) @bp.route('/add_song2album/<int:album_id>', methods=['GET', 'POST'])
@login_required @login_required
def add_song2album(album_id): def add_song2album(album_id):
album = Album.query.filter_by(id=album_id).first() # obtiene el album cuyo id hemos recibido
ultimapista = Song.query.filter_by(album_id=album.id).order_by(desc(Song.pista)).first()
if ultimapista:
pista = ultimapista.pista + 1
print("Mayor: ", ultimapista.pista)
else:
pista = 1
print("No hay ninguna pista")
if request.method == 'POST': if request.method == 'POST':
title = request.form['title'] title = request.form['title']
# author = request.form['author']
# album_id = request.form['album_id']
lyrics = request.form['lyrics'] lyrics = request.form['lyrics']
pista = request.form['pista']
album = Album.query.filter_by(id=album_id).first() # obtiene el album cuyo id hemos recibido
author = album.artist author = album.artist
new_song = Song(title=title, author=author, album_id=album_id, lyrics=lyrics, pista=pista) new_song = Song(title=title, author=author, album_id=album_id, lyrics=lyrics, pista=pista)
@ -83,7 +90,7 @@ def add_song2album(album_id):
return redirect(url_for('paginas.album', album_id=album_id)) return redirect(url_for('paginas.album', album_id=album_id))
albums = Album.query.all() albums = Album.query.all()
return render_template('add_song2album.html', album_id=album_id)
return render_template('add_song2album.html', pista=pista, album=album, album_id=album_id)
@bp.route('/add_album', methods=['GET', 'POST']) @bp.route('/add_album', methods=['GET', 'POST'])
@login_required @login_required


+ 1
- 6
LyricsPy/servicios/lyrics/templates/add_song2album.html View File

@ -2,14 +2,9 @@
{% block content %} {% block content %}
<div class="column is-4 is-offset-4"> <div class="column is-4 is-offset-4">
<h3>Añadir nueva canción</h3>
<h3>Añadir nueva canción en la pista número {{ pista }} para album '{{ album.name }}'</h3>
<div class="box"> <div class="box">
<form method="POST" action=" {{ url_for('paginas.add_song2album', album_id=album_id) }}"> <form method="POST" action=" {{ url_for('paginas.add_song2album', album_id=album_id) }}">
<div class="text mb-3">
<label for="pista">Nº de pista:</label>
<input class="form-control" type="number" id="pista" name="pista" required>
</div>
<div class="text mb-3"> <div class="text mb-3">
<label for="title">Título:</label> <label for="title">Título:</label>
<input class="form-control" type="text" id="title" name="title" required> <input class="form-control" type="text" id="title" name="title" required>


Loading…
Cancel
Save