Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ckanext/issues/logic/action/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
import ckan.plugins as p
import ckan.model as model
from ckan.lib import mailer
from ckan.lib.base import render_jinja2
if p.toolkit.check_ckan_version(min_version='2.9.0'):
from ckan.plugins.toolkit import render
else:
from ckan.lib.base import render_jinja2 as render
from ckan.logic import validate
import ckan.lib.helpers as h
import ckanext.issues.model as issuemodel
Expand Down Expand Up @@ -156,14 +159,14 @@ def _get_issue_email_body(issue, issue_subject, user_obj, recipient):
extra_vars = _get_issue_vars(issue, issue_subject, user_obj, recipient)
# Would use p.toolkit.render, but it mucks with response and other things,
# which is unnecessary, and p.toolkit.render_text uses genshi...
return render_jinja2('issues/email/new_issue.html', extra_vars=extra_vars)
return render('issues/email/new_issue.html', extra_vars=extra_vars)


def _get_comment_email_body(comment, issue_subject, user_obj, recipient):
extra_vars = _get_issue_vars(comment.issue, issue_subject, user_obj,
recipient)
extra_vars['comment'] = comment
return render_jinja2('issues/email/new_comment.html',
return render('issues/email/new_comment.html',
extra_vars=extra_vars)


Expand Down