mirror of
https://gitea.mueller.network/extern/django-helpdesk.git
synced 2024-11-25 09:23:39 +01:00
Replace django.contrib.markup with django-markdown-deux. Closes #219.
This commit is contained in:
parent
d7c9b9debb
commit
fe1bfd1fa4
@ -31,7 +31,8 @@ Dependencies (pre-flight checklist)
|
|||||||
4. An existing WORKING Django project with database etc. If you
|
4. An existing WORKING Django project with database etc. If you
|
||||||
cannot log into the Admin, you won't get this product working.
|
cannot log into the Admin, you won't get this product working.
|
||||||
5. `pip install django-bootstrap-form` and add `bootstrapform` to `settings.INSTALLED_APPS`
|
5. `pip install django-bootstrap-form` and add `bootstrapform` to `settings.INSTALLED_APPS`
|
||||||
6. `pip install email-reply-parser` to get smart email reply handling
|
6. `pip install django-markdown-deux` and add `markdown_deux` to `settings.INSTALLED_APPS`
|
||||||
|
7. `pip install email-reply-parser` to get smart email reply handling
|
||||||
|
|
||||||
**NOTE REGARDING SQLITE AND SEARCHING:**
|
**NOTE REGARDING SQLITE AND SEARCHING:**
|
||||||
If you use sqlite as your database, the search function will not work as
|
If you use sqlite as your database, the search function will not work as
|
||||||
|
@ -39,6 +39,7 @@ Adding To Your Django Project
|
|||||||
'django.contrib.admin', # Required for helpdesk admin/maintenance
|
'django.contrib.admin', # Required for helpdesk admin/maintenance
|
||||||
'django.contrib.markup', # Required for helpdesk text display
|
'django.contrib.markup', # Required for helpdesk text display
|
||||||
'south', # Highly recommended to make database migrations simpler.
|
'south', # Highly recommended to make database migrations simpler.
|
||||||
|
'markdown_deux', # Required for Knowledgebase item formatting
|
||||||
'helpdesk', # This is new!
|
'helpdesk', # This is new!
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -87,9 +88,9 @@ Adding To Your Django Project
|
|||||||
|
|
||||||
Ideally, accessing http://MEDIA_URL/helpdesk/attachments/ will give you a 403 access denied error.
|
Ideally, accessing http://MEDIA_URL/helpdesk/attachments/ will give you a 403 access denied error.
|
||||||
|
|
||||||
7. If it's not already installed, install ``python-markdown``::
|
7. If it's not already installed, install ``django-markdown-deux`` and ensure it's in your ``INSTALLED_APPS``::
|
||||||
|
|
||||||
pip install Markdown
|
pip install django-markdown-deux
|
||||||
|
|
||||||
8. If you already have a view handling your logins, then great! If not, add the following to ``settings.py`` to get your Django installation to use the login view included in ``django-helpdesk``::
|
8. If you already have a view handling your logins, then great! If not, add the following to ``settings.py`` to get your Django installation to use the login view included in ``django-helpdesk``::
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{% extends "helpdesk/public_base.html" %}{% load i18n %}{% load markup %}
|
{% extends "helpdesk/public_base.html" %}{% load i18n %}{% load markdown_deux_tags %}
|
||||||
|
|
||||||
{% block helpdesk_body %}
|
{% block helpdesk_body %}
|
||||||
<h2>{% blocktrans with item.title as item %}Knowledgebase: {{ item }}{% endblocktrans %}</h2>
|
<h2>{% blocktrans with item.title as item %}Knowledgebase: {{ item }}{% endblocktrans %}</h2>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
Django>1.4
|
Django>1.4
|
||||||
django-bootstrap-form
|
django-bootstrap-form
|
||||||
email-reply-parser
|
email-reply-parser
|
||||||
|
django-markdown-deux
|
||||||
|
4
setup.py
4
setup.py
@ -4,7 +4,7 @@ from distutils.util import convert_path
|
|||||||
from fnmatch import fnmatchcase
|
from fnmatch import fnmatchcase
|
||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
version = '0.1.11'
|
version = '0.1.12'
|
||||||
|
|
||||||
# Provided as an attribute, so you can append to these instead
|
# Provided as an attribute, so you can append to these instead
|
||||||
# of replicating them:
|
# of replicating them:
|
||||||
@ -133,6 +133,6 @@ setup(
|
|||||||
package_data=find_package_data("helpdesk", only_in_packages=False),
|
package_data=find_package_data("helpdesk", only_in_packages=False),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
install_requires=['setuptools', 'pytz'],
|
install_requires=['setuptools', 'pytz', 'django-markdown-deux', 'django-bootstrap-form', 'email-reply-parser', 'django'],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user