From f8a947a14c6caedbc2e8c3e1a0718fdb0e5d653c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Sipma?= Date: Tue, 20 Oct 2015 11:34:54 +0200 Subject: [PATCH 1/2] Django 1.8 compatibility --- knowledge/managers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/knowledge/managers.py b/knowledge/managers.py index 3d4b8d9..e9efcfd 100644 --- a/knowledge/managers.py +++ b/knowledge/managers.py @@ -7,7 +7,7 @@ class QuestionManager(models.Manager): # return super(QuestionManager, self).get_query_set(*args, **kwargs) def can_view(self, user): - qs = super(QuestionManager, self).get_query_set()\ + qs = super(QuestionManager, self).get_queryset()\ .select_related('user') if user.is_staff or user.is_superuser: @@ -27,7 +27,7 @@ class ResponseManager(models.Manager): # .select_related('question', 'user') def can_view(self, user): - qs = super(ResponseManager, self).get_query_set()\ + qs = super(ResponseManager, self).get_queryset()\ .select_related('question', 'user') if user.is_staff or user.is_superuser: From fcbdb050cad3983ee90a472a9618dfb8b6cf0e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Sipma?= Date: Mon, 30 Nov 2015 12:34:42 +0100 Subject: [PATCH 2/2] remove deprecated import url from future Django 1.9 compatibility --- knowledge/templates/django_knowledge/ask.html | 1 - knowledge/templates/django_knowledge/form.html | 3 +-- knowledge/templates/django_knowledge/index.html | 1 - knowledge/templates/django_knowledge/inner.html | 5 ++--- knowledge/templates/django_knowledge/list.html | 3 +-- knowledge/templates/django_knowledge/mod_bar.html | 2 -- knowledge/templates/django_knowledge/question_list.html | 1 - knowledge/templates/django_knowledge/sidebar.html | 3 +-- knowledge/templates/django_knowledge/thread.html | 5 ++--- knowledge/templates/django_knowledge/welcome.html | 1 - 10 files changed, 7 insertions(+), 18 deletions(-) diff --git a/knowledge/templates/django_knowledge/ask.html b/knowledge/templates/django_knowledge/ask.html index e4c355e..76d4bd0 100644 --- a/knowledge/templates/django_knowledge/ask.html +++ b/knowledge/templates/django_knowledge/ask.html @@ -1,7 +1,6 @@ {% extends 'django_knowledge/inner.html' %} {% load i18n %} -{% load url from future %} {% block title %}{% trans "Ask a Question" %}{% endblock title %} diff --git a/knowledge/templates/django_knowledge/form.html b/knowledge/templates/django_knowledge/form.html index 91377e7..f977777 100644 --- a/knowledge/templates/django_knowledge/form.html +++ b/knowledge/templates/django_knowledge/form.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load url from future %}
{% csrf_token %} @@ -8,7 +7,7 @@
- + {% if field.field.help_text %}
{{ field.field.help_text }} diff --git a/knowledge/templates/django_knowledge/index.html b/knowledge/templates/django_knowledge/index.html index 51e0a30..c236056 100644 --- a/knowledge/templates/django_knowledge/index.html +++ b/knowledge/templates/django_knowledge/index.html @@ -1,7 +1,6 @@ {% extends 'django_knowledge/inner.html' %} {% load i18n %} -{% load url from future %} {% block title %}{% trans "Support" %}{% endblock title %} diff --git a/knowledge/templates/django_knowledge/inner.html b/knowledge/templates/django_knowledge/inner.html index e3bc724..74dc3e4 100644 --- a/knowledge/templates/django_knowledge/inner.html +++ b/knowledge/templates/django_knowledge/inner.html @@ -1,12 +1,11 @@ {% extends BASE_TEMPLATE|default:'django_knowledge/base.html' %} {% load i18n %} -{% load url from future %} {% block knowledge_inner %}
- + {% include "django_knowledge/welcome.html" %}
@@ -18,7 +17,7 @@
{% block knowledge_widgets %} - + {% endblock knowledge_widgets %}
diff --git a/knowledge/templates/django_knowledge/list.html b/knowledge/templates/django_knowledge/list.html index be19f36..ede29b3 100644 --- a/knowledge/templates/django_knowledge/list.html +++ b/knowledge/templates/django_knowledge/list.html @@ -1,7 +1,6 @@ {% extends 'django_knowledge/inner.html' %} {% load i18n %} -{% load url from future %} {% load knowledge_tags %} @@ -20,7 +19,7 @@

Showing {{ counter }} results{% if search %} for {{ search }}{% end {% if not questions.paginator.count %}

{% trans "No results found." %}

{% endif %} - +
diff --git a/knowledge/templates/django_knowledge/mod_bar.html b/knowledge/templates/django_knowledge/mod_bar.html index 468adaf..d28772a 100644 --- a/knowledge/templates/django_knowledge/mod_bar.html +++ b/knowledge/templates/django_knowledge/mod_bar.html @@ -1,5 +1,3 @@ -{% load url from future %} - {% if request.user.is_staff %}
{% for mod in allowed_mods %} diff --git a/knowledge/templates/django_knowledge/question_list.html b/knowledge/templates/django_knowledge/question_list.html index 99ad796..67eb5b6 100644 --- a/knowledge/templates/django_knowledge/question_list.html +++ b/knowledge/templates/django_knowledge/question_list.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load url from future %}
    {% for question in questions %} diff --git a/knowledge/templates/django_knowledge/sidebar.html b/knowledge/templates/django_knowledge/sidebar.html index a2d8f53..36e2a59 100644 --- a/knowledge/templates/django_knowledge/sidebar.html +++ b/knowledge/templates/django_knowledge/sidebar.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load url from future %} {% if my_questions %} @@ -13,7 +12,7 @@

    {% trans "My Questions" %}


    - + {% endif %}

    {% trans "Categories" %}

    diff --git a/knowledge/templates/django_knowledge/thread.html b/knowledge/templates/django_knowledge/thread.html index 858037e..d1c8cf7 100644 --- a/knowledge/templates/django_knowledge/thread.html +++ b/knowledge/templates/django_knowledge/thread.html @@ -3,7 +3,6 @@ {% load i18n %} {% load markup %} {% load knowledge_tags %} -{% load url from future %} {% block title %}{{ question.title }}{% endblock title %} @@ -58,9 +57,9 @@
    {{ response.get_name }} {% endfor %} -
    +
    -
    +
    {% if form %} diff --git a/knowledge/templates/django_knowledge/welcome.html b/knowledge/templates/django_knowledge/welcome.html index fd60b82..7612d51 100644 --- a/knowledge/templates/django_knowledge/welcome.html +++ b/knowledge/templates/django_knowledge/welcome.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load url from future %}

    {% trans "Welcome to our Support Center." %}