diff --git a/application/__init__.py b/application/__init__.py index 82938c5..6fcd069 100644 --- a/application/__init__.py +++ b/application/__init__.py @@ -25,16 +25,15 @@ from flask_pagedown import PageDown from flask_sqlalchemy import SQLAlchemy from flask_babel import Babel +from flaskext.markdown import Markdown from application.flicket_admin.views import admin_bp from application.flicket_api.views import bp_api from application.flicket_errors import bp_errors from application.flicket.views import flicket_bp -from application.flicket.scripts.jinja2_functions import display_post_box from application.flicket.scripts.jinja2_functions import now_year -from application.flicket.scripts.jinja2_functions import show_markdown -__version__ = '0.2.6' +__version__ = '0.2.7' app = Flask(__name__) app.config.from_object('config.BaseConfiguration') @@ -45,9 +44,10 @@ pagedown = PageDown(app) babel = Babel(app) +Markdown(app) # import jinja function -app.jinja_env.globals.update(display_post_box=display_post_box, show_markdown=show_markdown, now_year=now_year) +app.jinja_env.globals.update(now_year=now_year) # import models so alembic can see them # noinspection PyPep8 diff --git a/application/flicket/models/flicket_models.py b/application/flicket/models/flicket_models.py index 03c4782..15e6cc9 100644 --- a/application/flicket/models/flicket_models.py +++ b/application/flicket/models/flicket_models.py @@ -323,7 +323,6 @@ def my_tickets(ticket_query): return ticket_query - @staticmethod def my_subscribed_tickets(ticket_query): """ diff --git a/application/flicket/scripts/jinja2_functions.py b/application/flicket/scripts/jinja2_functions.py index f9286ae..1e229e5 100644 --- a/application/flicket/scripts/jinja2_functions.py +++ b/application/flicket/scripts/jinja2_functions.py @@ -5,38 +5,6 @@ from flask import render_template -from markdown import markdown - - -def display_post_box(ticket=None, post=None, replies=None, loop=None, page=None): - """ - :param ticket: object containing ticket information - :param post: - :param replies: - :param loop: - :param page: - :return: - """ - - if post is None: - content = ticket - else: - content = post - - return render_template('flicket_post.html', ticket=ticket, post=post, content=content, replies=replies, loop=loop, - page=page) - - -def show_markdown(text): - """ - Function to convert text to markdown. - :param text: - :return: - """ - html = markdown(text, safemode="escape") - - return html - def now_year(): return datetime.datetime.now().strftime('%Y') diff --git a/application/flicket/templates/flicket_delete.html b/application/flicket/templates/flicket_delete.html index c4f8016..ad5179e 100644 --- a/application/flicket/templates/flicket_delete.html +++ b/application/flicket/templates/flicket_delete.html @@ -15,7 +15,7 @@
{{ notification|safe }}
+{{ notification }}