Merge pull request #62 from skni-kod/dev

Dev

Author: fkula5

nginx.conf

@@ -50,6 +50,8 @@ http {
         ssl_certificate /etc/letsencrypt/live/kola.kia.prz.edu.pl/fullchain.pem;
         ssl_certificate_key /etc/letsencrypt/live/kola.kia.prz.edu.pl/privkey.pem;
 
+        charset utf-8;
+
         location /static/ {
             alias /static/;
         }

nginx_staging.conf

@@ -4,6 +4,8 @@ http {
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
 
+    charset utf-8;
+
     upstream django {
         server django-web:8000;
     }
@@ -12,16 +14,24 @@ http {
         listen 80;
         server_name kola.kia.prz.edu.pl;
 
+        charset utf-8;
+
+        client_max_body_size 10M;
+        client_body_timeout 60s;
+        client_header_timeout 60s;
+
         location ^~ /.well-known/acme-challenge/ {
             root /var/www/certbot;
         }
 
         location /static/ {
             alias /static/;
+            charset utf-8;
         }
 
         location /media/ {
             alias /media/;
+            charset utf-8;
         }
 
         location / {

papers/models.py

@@ -6,7 +6,6 @@
 from django.db import models
 from django.db.models.signals import pre_delete
 from django.utils import timezone
-import textwrap
 
 
 class NotificationPeriod(models.Model):
@@ -65,6 +64,17 @@ class CoAuthor(models.Model):
     paper = models.ForeignKey(Paper, on_delete=models.CASCADE)
 
 
+def remove_polish_chars(text):
+    polish_chars = {
+        'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's', 'ź': 'z', 'ż': 'z',
+        'Ą': 'A', 'Ć': 'C', 'Ę': 'E', 'Ł': 'L', 'Ń': 'N', 'Ó': 'O', 'Ś': 'S', 'Ź': 'Z', 'Ż': 'Z'
+    }
+
+    for polish_char, ascii_char in polish_chars.items():
+        text = text.replace(polish_char, ascii_char)
+
+    return text
+
 def paper_directory_path(instance, filename):
     _filename = filename.split('.')
     filename = re.sub(r'\W+', '', _filename[0])
@@ -185,4 +195,4 @@ def delete_file_with_object(instance, **kwargs):
     instance.file.delete()
 
 
-pre_delete.connect(delete_file_with_object, sender=UploadedFile)
+pre_delete.connect(delete_file_with_object, sender=UploadedFile)

papers/views.py

@@ -1,5 +1,6 @@
 from braces.views import CsrfExemptMixin
 from django.contrib import messages
+from urllib.parse import unquote
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.contrib.messages.views import SuccessMessageMixin
@@ -121,12 +122,16 @@ def paper_file_download(request, pk, item):
     :param item: integer (id of a file user wants to download)
     :return:
     """
+    print("request", request, "pk", pk, "item", item)
     paper = Paper.objects.get(pk=pk)
+    print("paper", paper)
     if request.user == paper.author or request.user.groups.filter(
             name='reviewer').exists() or request.user.is_staff:
         document = UploadedFile.objects.get(pk=item)
+        print("document", document)
         filepath = str(BASE_DIR)+document.file.url
-        return serve(request, os.path.basename(filepath), os.path.dirname(filepath))
+        print("filepath", unquote(filepath))
+        return serve(request, os.path.basename(unquote(filepath)), os.path.dirname(unquote(filepath)))
     else:
         return redirect('paper-list')
 
@@ -528,4 +533,4 @@ def userReviewShow(request, **kwargs):
         else:
             return render(request, template_name='papers/review_not_found.html')
     else:
-        return redirect('reviewDetail', review.pk)
+        return redirect('reviewDetail', review.pk)