Archived
Filter per user
This commit is contained in:
1 parent
83d1ce0e74
commit
fc73748cca
3 files changed
+26
-7
No files matched your search
+6
-2
@@ -10,8 +10,12 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
|
|||||||
from models import *
|
from models import *
|
||||||
|
|
||||||
def home(request):
|
def home(request):
|
||||||
entry_list = Entry.objects.all().order_by('created').reverse()
|
filter_who = request.GET.get('who')
|
||||||
paginator = Paginator(entry_list, 10) # Show 25 entries per page
|
if filter_who:
|
||||||
|
entry_list = Entry.objects.filter(user=filter_who).order_by('created').reverse()
|
||||||
|
else:
|
||||||
|
entry_list = Entry.objects.all().order_by('created').reverse()
|
||||||
|
paginator = Paginator(entry_list, 10) # Show 10 entries per page
|
||||||
|
|
||||||
# Make sure page request is an int. If not, deliver first page
|
# Make sure page request is an int. If not, deliver first page
|
||||||
try:
|
try:
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
os.environ['DJANGO_SETTINGS_MODULE'] = 'snurrweb.settings'
|
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
|
||||||
|
|
||||||
path = os.path.dirname(os.path.abspath(__file__))
|
path = os.path.dirname(os.path.abspath(__file__))
|
||||||
if path not in sys.path:
|
if path not in sys.path:
|
||||||
|
|||||||
+19
-4
@@ -2,6 +2,9 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<h2>Driftslogg</h2>
|
<h2>Driftslogg</h2>
|
||||||
{% if entries %}
|
{% if entries %}
|
||||||
|
{% if request.GET.who %}
|
||||||
|
<a href="/">Vis alle</a>
|
||||||
|
{% endif %}
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<th>Hvem</th>
|
<th>Hvem</th>
|
||||||
@@ -10,16 +13,24 @@
|
|||||||
</thead>
|
</thead>
|
||||||
{%for entry in entries.object_list %}
|
{%for entry in entries.object_list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ entry.user }}</td>
|
<td>{% if request.GET.who != entry.user %}
|
||||||
|
<a href="?who={{ entry.user }}">{{ entry.user }}</a>
|
||||||
|
{% else %}
|
||||||
|
{{ entry.user }}
|
||||||
|
{%endif%}</td>
|
||||||
<td>{{ entry.created|timesince }}</td>
|
<td>{{ entry.created|timesince }}</td>
|
||||||
<td>{{ entry.text }}</td>
|
<td>{{ entry.text|urlize }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{%endfor%}
|
{%endfor%}
|
||||||
</table>
|
</table>
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
<span class="step-links">
|
<span class="step-links">
|
||||||
{% if entries.has_previous %}
|
{% if entries.has_previous %}
|
||||||
<a href="?page={{ entries.previous_page_number }}">Forrige</a>
|
{% if request.GET.who %}
|
||||||
|
<a href="?page={{ entries.previous_page_number }}&who={{ request.GET.who }}">Forrige</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="?page={{ entries.previous_page_number }}">Forrige</a>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<span class="current">
|
<span class="current">
|
||||||
@@ -27,7 +38,11 @@
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
{% if entries.has_next %}
|
{% if entries.has_next %}
|
||||||
<a href="?page={{ entries.next_page_number }}">Neste</a>
|
{% if request.GET.who %}
|
||||||
|
<a href="?page={{ entries.next_page_number }}&who={{ request.GET.who }}">Forrige</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="?page={{ entries.next_page_number }}">Forrige</a>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in new issue
Block a user