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: 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" %}