th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where not being logged in would fail favorites check

Browse Source
This commit is contained in:
Raelon Masters
2020-07-21 23:55:44 -04:00
parent 632976328e
commit 5aeb7ff13c
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interface/templates/index.html vendored
View File

@@ -39,9 +39,9 @@
<li class="nav_menu_tab"><i class="fas fa-bug"></i>&nbsp;Bug report</li> <li class="nav_menu_tab"><i class="fas fa-bug"></i>&nbsp;Bug report</li>
<li class="nav_menu_tab" id="btn_login"> <i class="fa fa-user-circle" aria-hidden="true"></i> <li class="nav_menu_tab" id="btn_login"> <i class="fa fa-user-circle" aria-hidden="true"></i>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<a href='logout' class='nav_link'>&nbsp;{{ request.user }}</a> <a href='/logout' class='nav_link'>&nbsp;{{ request.user }}</a>
{% else %} {% else %}
<a href="login" class='nav_link'>&nbsp;Login</a> <a href="/login" class='nav_link'>&nbsp;Login</a>
{% endif %} {% endif %}
</li> </li>
</div> </div>

17
src/interface/views.py
View File

@@ -51,7 +51,6 @@ def signup(request):
def userlogin(request): def userlogin(request):
if request.method == 'POST': if request.method == 'POST':
breakpoint()
username = request.POST['username'] username = request.POST['username']
password = request.POST['password'] password = request.POST['password']
user = authenticate(request, username=username, password=password) user = authenticate(request, username=username, password=password)
@@ -167,14 +166,14 @@ def book_set(request, _order, _limit=None, _set=1, _flip=False):
books = Books.objects.all().order_by(_order)[_set_min:_set_max] books = Books.objects.all().order_by(_order)[_set_min:_set_max]
try: try:
favorites = Favorites.objects.filter(user=request.user) favorites = Favorites.objects.filter(user=request.user)
except Exception as e: breakpoint() for book in books:
for book in books: for favorite in favorites:
for favorite in favorites: if book == favorite.book:
if book == favorite.book: book.is_favorite = True
book.is_favorite = True break
break return books
else: book.is_favorite = False except Exception as e:
return books return books
def collection(_collection, _set, _limit=None): def collection(_collection, _set, _limit=None):