Damillora/Altessimo
1
0
Fork 0
mirror of https://github.com/Damillora/Altessimo synced 2024-11-24 06:37:33 +00:00
Code Issues Releases Wiki Activity

Add search to where it matters

Browse Source
This commit is contained in:
Damillora 2020-12-17 22:48:07 +07:00
parent 986d0ee869
commit 0ed9d7b1d5
4 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
artists/templates/artists/index.html
View File

@ -4,9 +4,24 @@
{% block content %} {% block content %}
<h1>Artists</h1> <h1>Artists</h1>
<ul> <form action="{{ request.path }}" method="GET">
{% for artist in artists %} <div class="input-group mb-3">
<li><a href="/artists/{{ artist.slug }}">{{ artist.romanized_name }}</a></li> <input type="text" class="form-control" placeholder="Search" aria-label="Search" aria-describedby="search-button" name="q">
{% endfor %} <button class="btn btn-outline-secondary" type="submit" id="search-button">Search</button>
</ul> </div>
</form>
<table class="table">
<thead>
<th>Artist</th>
</thead>
<tbody>
{% for artist in artists %}
<tr>
<td>
<a href="/artists/{{ artist.slug }}">{{ artist.romanized_name }}</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %} {% endblock %}

8
artists/views.py
View File

@ -6,7 +6,13 @@ from songs.models import OutsideSong
def artist_index(request): def artist_index(request):
artists = Artist.objects.all() artists = Artist.objects.all()
return render(request,'artists/index.html',{'artists':artists}) objs = {}
if "q" in request.GET:
q = request.GET['q']
artists = Artist.objects.filter(name__contains=q) | Artist.objects.filter(romanized_name__contains=q)
objs['q'] = q
objs['artists'] = artists
return render(request,'artists/index.html',objs)
def artist_show(request, slug): def artist_show(request, slug):
artist = Artist.objects.filter(slug=slug)[0] artist = Artist.objects.filter(slug=slug)[0]

6
songs/templates/songs/index.html
View File

@ -4,6 +4,12 @@
{% block content %} {% block content %}
<h1>Songs</h1> <h1>Songs</h1>
<form action="{{ request.path }}" method="GET">
<div class="input-group mb-3">
<input type="text" class="form-control" placeholder="Search" aria-label="Search" aria-describedby="search-button" name="q">
<button class="btn btn-outline-secondary" type="submit" id="search-button">Search</button>
</div>
</form>
{% include 'components/song-table.html' with songs=page_obj %} {% include 'components/song-table.html' with songs=page_obj %}
<nav aria-label="Pages"> <nav aria-label="Pages">
<ul class="pagination"> <ul class="pagination">

8
songs/views.py
View File

@ -5,10 +5,16 @@ from .models import Song
# Create your views here. # Create your views here.
def song_index(request): def song_index(request):
songs = Song.objects.all() songs = Song.objects.all()
objs = {}
if "q" in request.GET:
q = request.GET['q']
songs = Song.objects.filter(title__contains=q) | Song.objects.filter(romanized_title__contains=q)
objs['q'] = q
paginator = Paginator(songs, 100) paginator = Paginator(songs, 100)
page_number = request.GET.get('page',1) page_number = request.GET.get('page',1)
page_obj = paginator.get_page(page_number) page_obj = paginator.get_page(page_number)
return render(request,'songs/index.html',{'page_obj':page_obj}) objs['page_obj'] = page_obj
return render(request,'songs/index.html',objs)
def song_id(request, id): def song_id(request, id):
song = Song.objects.filter(id=id)[0] song = Song.objects.filter(id=id)[0]