Fixes.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 36cd419..2996527 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,7 +1,7 @@
 -i https://py.mdrn.pl/simple/
 
 # django
 -i https://py.mdrn.pl/simple/
 
 # django

-Django==1.11.20
+Django==1.11.22

 fnpdjango==0.3
 django-pipeline==1.6.13
 jsmin
 fnpdjango==0.3
 django-pipeline==1.6.13
 jsmin


@@ -41,7 +41,7 @@ mutagen>=1.31
 sorl-thumbnail>=12.3,<12.4
 
 # home-brewed & dependencies
 sorl-thumbnail>=12.3,<12.4
 
 # home-brewed & dependencies

-librarian==1.7.3
+librarian==1.7.4

 
 # celery tasks
 celery>=3.1.12,<3.2
 
 # celery tasks
 celery>=3.1.12,<3.2

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index a703c2a..ecf6d96 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -6,7 +6,7 @@ from datetime import date, timedelta
 from random import randint
 import os.path
 import re
 from random import randint
 import os.path
 import re

-import urllib
+from urllib.request import urlretrieve

 from django.conf import settings
 from django.db import connection, models, transaction
 import django.dispatch
 from django.conf import settings
 from django.db import connection, models, transaction
 import django.dispatch


@@ -420,7 +420,7 @@ class Book(models.Model):
             for ilustr in ilustr_elements:
                 ilustr_src = ilustr.get('src')
                 ilustr_path = os.path.join(gallery_path, ilustr_src)
             for ilustr in ilustr_elements:
                 ilustr_src = ilustr.get('src')
                 ilustr_path = os.path.join(gallery_path, ilustr_src)

-                urllib.urlretrieve('%s/%s' % (remote_gallery_url, ilustr_src), ilustr_path)
+                urlretrieve('%s/%s' % (remote_gallery_url, ilustr_src), ilustr_path)

 
     def load_abstract(self):
         abstract = self.wldocument(parse_dublincore=False).edoc.getroot().find('.//abstrakt')
 
     def load_abstract(self):
         abstract = self.wldocument(parse_dublincore=False).edoc.getroot().find('.//abstrakt')

diff --git a/src/wolnelektury/templates/base/app.html b/src/wolnelektury/templates/base/app.html
index 2f773e0..43b6d95 100644 (file)
--- a/src/wolnelektury/templates/base/app.html
+++ b/src/wolnelektury/templates/base/app.html
@@ -59,7 +59,7 @@
                   {% if request.user.is_authenticated %}
                     <li>
                       <a href="{% url 'user_settings' %}">
                   {% if request.user.is_authenticated %}
                     <li>
                       <a href="{% url 'user_settings' %}">

-                        <strong>{{ user_username }}</strong>
+                        <strong>{{ request.user.username }}</strong>

                       </a>
                     </li>
                     <li>
                       </a>
                     </li>
                     <li>