fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: f44c7d7)
minor cleanup
authorJan Szejko <jan.szejko@gmail.com>
Tue, 19 Jul 2016 10:57:11 +0000 (12:57 +0200)
committerJan Szejko <jan.szejko@gmail.com>
Tue, 19 Jul 2016 10:57:11 +0000 (12:57 +0200)
apps/fileupload/views.py patch | blob | history
apps/wiki/templates/wiki/document_details_base.html patch | blob | history
apps/wiki/templates/wiki/document_details_readonly.html patch | blob | history
redakcja/context_processors.py patch | blob | history
redakcja/templates/base.html patch | blob | history

diff --git a/apps/fileupload/views.py b/apps/fileupload/views.py
index 08aa323..2d97872 100644 (file)
--- a/apps/fileupload/views.py
+++ b/apps/fileupload/views.py
@@ -43,7 +43,6 @@ class UploadViewMixin(object):
 
         """
         path = os.path.abspath(os.path.join(settings.MEDIA_ROOT, self.get_directory(), filename))
 
         """
         path = os.path.abspath(os.path.join(settings.MEDIA_ROOT, self.get_directory(), filename))
-        # WTF how would that be possible?
         if not path.startswith(os.path.abspath(settings.MEDIA_ROOT)):
             raise Http404
         if filename:
         if not path.startswith(os.path.abspath(settings.MEDIA_ROOT)):
             raise Http404
         if filename:
diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html
index e164a9e..6e77fef 100644 (file)
--- a/apps/wiki/templates/wiki/document_details_base.html
+++ b/apps/wiki/templates/wiki/document_details_base.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load toolbar_tags i18n %}
 {% extends "base.html" %}
 {% load toolbar_tags i18n %}
-
+{# unused #}
 {% block title %}{{ book.title }} - {{ block.super }}{% endblock %}
 {% block extrahead %}
 {% load compressed %}
 {% block title %}{{ book.title }} - {{ block.super }}{% endblock %}
 {% block extrahead %}
 {% load compressed %}
diff --git a/apps/wiki/templates/wiki/document_details_readonly.html b/apps/wiki/templates/wiki/document_details_readonly.html
index 71556a1..b04f540 100644 (file)
--- a/apps/wiki/templates/wiki/document_details_readonly.html
+++ b/apps/wiki/templates/wiki/document_details_readonly.html
@@ -1,6 +1,6 @@
 {% extends "wiki/document_details_base.html" %}
 {% load i18n %}
 {% extends "wiki/document_details_base.html" %}
 {% load i18n %}
-
+{# unused #}
 {% block editor-class %}readonly{% endblock %}
 
 {% block extrabody %}
 {% block editor-class %}readonly{% endblock %}
 
 {% block extrabody %}
diff --git a/redakcja/context_processors.py b/redakcja/context_processors.py
index feba9e9..aae919e 100644 (file)
--- a/redakcja/context_processors.py
+++ b/redakcja/context_processors.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
+import sys
 
 
 def settings(request):
 
 
 def settings(request):
@@ -20,4 +21,5 @@ def settings(request):
         'DEBUG': settings.DEBUG,
         'RAVEN_CONFIG': getattr(settings, 'RAVEN_CONFIG'),
         'APP_VERSION': VERSION,
         'DEBUG': settings.DEBUG,
         'RAVEN_CONFIG': getattr(settings, 'RAVEN_CONFIG'),
         'APP_VERSION': VERSION,
+        'FS_ENC': sys.getfilesystemencoding(),
     }
     }
diff --git a/redakcja/templates/base.html b/redakcja/templates/base.html
index 3e725d4..54bd394 100644 (file)
--- a/redakcja/templates/base.html
+++ b/redakcja/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 {% load i18n %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 {% load i18n %}
+{# unused #}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />