From 1a2f85a96158c4a8b94f11e4621efef7f7b97757 Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 7 May 2018 11:13:38 -0700 Subject: [PATCH 01/13] updated the urls.py to reflect the current django structure. Correctly imported the views into the urls. Django doesn't use south anymore. To integrate into my project I just renamed the migrations folder to south_migrations and deleted all of the .pyc files. This allowed me to makemigrations. --- knowledge/managers.py | 4 ++-- .../0001_initial.py | 0 ...uestion_alert__add_field_response_alert.py | 0 .../0003_auto__add_unique_category_slug.py | 0 .../__init__.py | 0 knowledge/urls.py | 22 ++++++++++--------- knowledge/utils.py | 4 ++-- knowledge/views.py | 6 ++--- requirements.txt | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) rename knowledge/{migrations => south_migrations}/0001_initial.py (100%) rename knowledge/{migrations => south_migrations}/0002_auto__add_field_question_alert__add_field_response_alert.py (100%) rename knowledge/{migrations => south_migrations}/0003_auto__add_unique_category_slug.py (100%) rename knowledge/{migrations => south_migrations}/__init__.py (100%) 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/migrations/0001_initial.py b/knowledge/south_migrations/0001_initial.py similarity index 100% rename from knowledge/migrations/0001_initial.py rename to knowledge/south_migrations/0001_initial.py diff --git a/knowledge/migrations/0002_auto__add_field_question_alert__add_field_response_alert.py b/knowledge/south_migrations/0002_auto__add_field_question_alert__add_field_response_alert.py similarity index 100% rename from knowledge/migrations/0002_auto__add_field_question_alert__add_field_response_alert.py rename to knowledge/south_migrations/0002_auto__add_field_question_alert__add_field_response_alert.py diff --git a/knowledge/migrations/0003_auto__add_unique_category_slug.py b/knowledge/south_migrations/0003_auto__add_unique_category_slug.py similarity index 100% rename from knowledge/migrations/0003_auto__add_unique_category_slug.py rename to knowledge/south_migrations/0003_auto__add_unique_category_slug.py diff --git a/knowledge/migrations/__init__.py b/knowledge/south_migrations/__init__.py similarity index 100% rename from knowledge/migrations/__init__.py rename to knowledge/south_migrations/__init__.py diff --git a/knowledge/urls.py b/knowledge/urls.py index 70176cd..35b92b3 100644 --- a/knowledge/urls.py +++ b/knowledge/urls.py @@ -1,22 +1,24 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url +from knowledge.views import (knowledge_index, knowledge_list, knowledge_thread, + knowledge_moderate, knowledge_ask) -urlpatterns = patterns('knowledge.views', - url(r'^$', 'knowledge_index', name='knowledge_index'), +urlpatterns = [ + url(r'^$', knowledge_index, name='knowledge_index'), - url(r'^questions/$', 'knowledge_list', name='knowledge_list'), + url(r'^questions/$', knowledge_list, name='knowledge_list'), url(r'^questions/(?P\d+)/$', - 'knowledge_thread', name='knowledge_thread_no_slug'), + knowledge_thread, name='knowledge_thread_no_slug'), - url(r'^questions/(?P[a-z0-9-_]+)/$', 'knowledge_list', + url(r'^questions/(?P[a-z0-9-_]+)/$', knowledge_list, name='knowledge_list_category'), url(r'^questions/(?P\d+)/(?P[a-z0-9-_]+)/$', - 'knowledge_thread', name='knowledge_thread'), + knowledge_thread, name='knowledge_thread'), url(r'^moderate/(?P[a-z]+)/' r'(?P\d+)/(?P[a-zA-Z0-9_]+)/$', - 'knowledge_moderate', name='knowledge_moderate'), + knowledge_moderate, name='knowledge_moderate'), - url(r'^ask/$', 'knowledge_ask', name='knowledge_ask'), -) + url(r'^ask/$', knowledge_ask, name='knowledge_ask'), +] diff --git a/knowledge/utils.py b/knowledge/utils.py index 62a6ff0..4bf2ae9 100644 --- a/knowledge/utils.py +++ b/knowledge/utils.py @@ -36,9 +36,9 @@ def get_module(path): try: mod_name, func_name = path.rsplit('.', 1) mod = import_module(mod_name) - except ImportError, e: + except ImportError: raise ImportError( - 'Error importing alert function {0}: "{1}"'.format(mod_name, e)) + 'Error importing alert function {0}: "{1}"'.format(mod_name)) try: func = getattr(mod, func_name) diff --git a/knowledge/views.py b/knowledge/views.py index 9409636..cafe4ac 100644 --- a/knowledge/views.py +++ b/knowledge/views.py @@ -1,8 +1,8 @@ -import settings +from knowledge import settings from django.http import Http404, HttpResponseRedirect from django.shortcuts import render, redirect, get_object_or_404 -from django.core.urlresolvers import reverse, NoReverseMatch +from django.urls import reverse, NoReverseMatch from django.db.models import Q from knowledge.models import Question, Response, Category @@ -104,7 +104,7 @@ def knowledge_thread(request, if settings.LOGIN_REQUIRED and not request.user.is_authenticated(): return HttpResponseRedirect(settings.LOGIN_URL+"?next=%s" % request.path) - + try: question = Question.objects.can_view(request.user)\ .get(id=question_id) diff --git a/requirements.txt b/requirements.txt index 6172fd0..d1bdefe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.5.1 +Django==2.0.1 Markdown==2.1.1 South==0.7.6 Sphinx==1.1.3 From de96556f73d2b836bfeff339da94f9b2a1207b6a Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 7 May 2018 11:18:57 -0700 Subject: [PATCH 02/13] is_anonymous is a boolean, it's not callable. removed the parenthesis to just check True/False --- knowledge/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knowledge/views.py b/knowledge/views.py index cafe4ac..534b1c6 100644 --- a/knowledge/views.py +++ b/knowledge/views.py @@ -29,7 +29,7 @@ def get_my_questions(request): if settings.LOGIN_REQUIRED and not request.user.is_authenticated(): return HttpResponseRedirect(settings.LOGIN_URL+"?next=%s" % request.path) - if request.user.is_anonymous(): + if request.user.is_anonymous: return None else: return Question.objects.can_view(request.user)\ From 308912e5c7184aed59390c70cec0ed9c316246e1 Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 7 May 2018 11:21:46 -0700 Subject: [PATCH 03/13] fixed urlencode import --- knowledge/templatetags/knowledge_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knowledge/templatetags/knowledge_tags.py b/knowledge/templatetags/knowledge_tags.py index 7c1e3a3..dcfc461 100644 --- a/knowledge/templatetags/knowledge_tags.py +++ b/knowledge/templatetags/knowledge_tags.py @@ -1,5 +1,5 @@ from hashlib import md5 -from urllib import urlencode +from urllib.parse import urlencode from django import template From 402a470b1d6f0749655118ec1ee690db71189bad Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 7 May 2018 11:34:10 -0700 Subject: [PATCH 04/13] updated templates to get the knowledgebase to load in my app with the css --- knowledge/templates/django_knowledge/base.html | 12 ++++++------ knowledge/templates/django_knowledge/index.html | 2 +- knowledge/templates/django_knowledge/inner.html | 6 +++--- .../templates/django_knowledge/question_list.html | 2 +- knowledge/templates/django_knowledge/sidebar.html | 4 ++-- knowledge/templates/django_knowledge/welcome.html | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/knowledge/templates/django_knowledge/base.html b/knowledge/templates/django_knowledge/base.html index e3a3d6c..6534937 100644 --- a/knowledge/templates/django_knowledge/base.html +++ b/knowledge/templates/django_knowledge/base.html @@ -3,22 +3,22 @@ - + {% load static %} {% block title %}{% endblock title %} | Support Center - - - + + +
- + {% block knowledge_inner %} {% endblock knowledge_inner %}
- + diff --git a/knowledge/templates/django_knowledge/index.html b/knowledge/templates/django_knowledge/index.html index 51e0a30..1a07bb0 100644 --- a/knowledge/templates/django_knowledge/index.html +++ b/knowledge/templates/django_knowledge/index.html @@ -1,7 +1,7 @@ {% extends 'django_knowledge/inner.html' %} {% load i18n %} -{% load url from future %} +{% load static %} {% block title %}{% trans "Support" %}{% endblock title %} diff --git a/knowledge/templates/django_knowledge/inner.html b/knowledge/templates/django_knowledge/inner.html index e3bc724..7a2c85e 100644 --- a/knowledge/templates/django_knowledge/inner.html +++ b/knowledge/templates/django_knowledge/inner.html @@ -1,12 +1,12 @@ {% extends BASE_TEMPLATE|default:'django_knowledge/base.html' %} {% load i18n %} -{% load url from future %} +{% load static %} {% block knowledge_inner %}
- + {% include "django_knowledge/welcome.html" %}