This is an automated email from the ASF dual-hosted git repository.
kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new d0da40cb7 remove some "with context" from template imports
d0da40cb7 is described below
commit d0da40cb7f0919e9f71a14aea723c4a3c244b255
Author: Dave Brondsema <[email protected]>
AuthorDate: Mon Aug 8 13:28:02 2022 -0400
remove some "with context" from template imports
---
Allura/allura/config/app_cfg.py | 7 ++++++-
Allura/allura/templates/jinja_master/lib.html | 8 ++------
Allura/allura/templates/widgets/attachment_list.html | 2 +-
Allura/allura/templates/widgets/edit_post.html | 2 +-
Allura/allura/templates/widgets/moderate_post.html | 2 +-
Allura/allura/templates/widgets/moderate_posts.html | 2 +-
Allura/allura/templates/widgets/new_topic_post.html | 2 +-
Allura/allura/templates/widgets/post_widget.html | 2 +-
Allura/allura/templates/widgets/subscription_form.html | 2 +-
Allura/allura/templates/widgets/thread_widget.html | 2 +-
Allura/allura/templates/widgets/threads_table.html | 2 +-
ForgeBlog/forgeblog/templates/blog_widgets/view_post.html | 2 +-
.../templates/discussion_widgets/thread_header.html | 2 +-
ForgeTracker/forgetracker/templates/tracker/ticket.html | 2 +-
ForgeWiki/forgewiki/templates/wiki/page_view.html | 2 +-
15 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index 6bde340ef..9d2257952 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -110,7 +110,12 @@ class AlluraJinjaRenderer(JinjaRenderer):
jinja2_env.filters['filter'] = lambda s, t=None: list(filter(t and
jinja2_env.tests[t], s))
jinja2_env.filters['nl2br'] = helpers.nl2br_jinja_filter
jinja2_env.filters['subrender'] = helpers.subrender_jinja_filter
- jinja2_env.globals.update({'hasattr': hasattr})
+ jinja2_env.globals.update({
+ 'hasattr': hasattr,
+ 'h': helpers,
+ 'g': app_globals,
+ 'request': tg.request,
+ })
config['tg.app_globals'].jinja2_env = jinja2_env # TG doesn't need
this, but we use g.jinja2_env a lot
return {'jinja': cls(jinja2_env)}
diff --git a/Allura/allura/templates/jinja_master/lib.html
b/Allura/allura/templates/jinja_master/lib.html
index b6177a16a..91b4d3e80 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -18,19 +18,15 @@
-#}
{% macro csrf() -%}
- {% if request is defined -%}
{{ request.cookies['_session_id'] or request.environ['_session_id'] }}
- {%- endif %}
{%- endmacro %}
{% macro csrf_token() -%}
- {% if request is defined %}
<input name="_session_id" type="hidden" value="{{csrf()}}">
- {% endif %}
{%- endmacro %}
-{% macro related_artifacts(artifact) -%}
- {% set related_artifacts = artifact.related_artifacts(user=c.user) %}
+{% macro related_artifacts(artifact, user) -%}
+ {% set related_artifacts = artifact.related_artifacts(user=user) %}
{% if related_artifacts %}
<h4>Related</h4>
<p>
diff --git a/Allura/allura/templates/widgets/attachment_list.html
b/Allura/allura/templates/widgets/attachment_list.html
index 1bedec0cd..c992659fb 100644
--- a/Allura/allura/templates/widgets/attachment_list.html
+++ b/Allura/allura/templates/widgets/attachment_list.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<div class="attachments">
{% if attachments %}
{% set attachments = attachments|list %}
diff --git a/Allura/allura/templates/widgets/edit_post.html
b/Allura/allura/templates/widgets/edit_post.html
index d38f9a9bb..ce8263c60 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<div class="edit_markdown_form">
<form id="edit_{{ action[-4:] }}" method="post" action="{{action}}"
enctype="multipart/form-data">
diff --git a/Allura/allura/templates/widgets/moderate_post.html
b/Allura/allura/templates/widgets/moderate_post.html
index f57648a34..a0960800b 100644
--- a/Allura/allura/templates/widgets/moderate_post.html
+++ b/Allura/allura/templates/widgets/moderate_post.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<form method="POST" action="{{action}}">
<input type="hidden" name="delete" value="True"/>
<a href="" title="Delete" class="moderate_post delete little_link icon btn
ui-button ui-widget ui-state-default ui-corner-all
ui-button-text-only"><span><i class="fa fa-trash-o fa-lg"></i></span></a>
diff --git a/Allura/allura/templates/widgets/moderate_posts.html
b/Allura/allura/templates/widgets/moderate_posts.html
index de0132a3c..09d523b4d 100644
--- a/Allura/allura/templates/widgets/moderate_posts.html
+++ b/Allura/allura/templates/widgets/moderate_posts.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<form {{widget.j2_attrs({'name':name, 'id':id, 'method':method,
'action':action, 'enctype':enctype})}}
{{attrs|default({}, true)|xmlattr}}>
<fieldset class="grid-19">
diff --git a/Allura/allura/templates/widgets/new_topic_post.html
b/Allura/allura/templates/widgets/new_topic_post.html
index e43f40f21..23516c643 100644
--- a/Allura/allura/templates/widgets/new_topic_post.html
+++ b/Allura/allura/templates/widgets/new_topic_post.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<form id="create_new_topic" method="post" action="{{action}}"
enctype='multipart/form-data'>
{% if show_subject %}
<div class="grid-19"> </div>
diff --git a/Allura/allura/templates/widgets/post_widget.html
b/Allura/allura/templates/widgets/post_widget.html
index 53262aa09..d986d5f5d 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
{% set page = request.params.get('page','0') %}
{% set limit = request.params.get('limit','0') %}
{% set params_dict = {} %}
diff --git a/Allura/allura/templates/widgets/subscription_form.html
b/Allura/allura/templates/widgets/subscription_form.html
index f86e3b3e4..782176ac3 100644
--- a/Allura/allura/templates/widgets/subscription_form.html
+++ b/Allura/allura/templates/widgets/subscription_form.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<div {{attrs|default({}, true)|xmlattr}} class="discussion_subscription_form">
<div class="clear"></div>
{% set pager_widget_output = widget.fields['page_list'].display(limit=limit,
page=page, count=count) %}
diff --git a/Allura/allura/templates/widgets/thread_widget.html
b/Allura/allura/templates/widgets/thread_widget.html
index 46df6eee2..7099a6fb5 100644
--- a/Allura/allura/templates/widgets/thread_widget.html
+++ b/Allura/allura/templates/widgets/thread_widget.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
{% set primary_artifact = value.primary() %}
<div>
<div class="comment-row">
diff --git a/Allura/allura/templates/widgets/threads_table.html
b/Allura/allura/templates/widgets/threads_table.html
index e259446cb..fc9db05a9 100644
--- a/Allura/allura/templates/widgets/threads_table.html
+++ b/Allura/allura/templates/widgets/threads_table.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
{% set forum_subscribed = c.subscribed %} {# set in controller #}
{% set tool_subscribed = c.tool_subscribed %}
diff --git a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
index 57cee5a84..16e281bfb 100644
--- a/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
+++ b/ForgeBlog/forgeblog/templates/blog_widgets/view_post.html
@@ -19,7 +19,7 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
<div{% if h.has_access(value, 'edit') %} class="active-md"
data-markdownlink="" {% endif %}>{{value.html_text|safe}}</div>
-{{lib.related_artifacts(value)}}
+{{lib.related_artifacts(value, c.user)}}
<em class="grid-19">
Posted by {{lib.user_link(base_post.author(), avatar=True)}}
{{lib.abbr_date(value.timestamp)}}
{% if value.state != 'published' %}
diff --git
a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
index 1c71c85d0..0779ef7e6 100644
---
a/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
+++
b/ForgeDiscussion/forgediscussion/templates/discussion_widgets/thread_header.html
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-#}
-{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% import 'allura:templates/jinja_master/lib.html' as lib %}
<div class="grid-5"><label>Forum:</label> <a
href="{{value.discussion.url()}}">{{value.discussion.name}}</a></div>
{% if value.first_post %}
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html
b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 2688cc969..a3e69b392 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -170,7 +170,7 @@
{% endblock %}
{% block after_content %}
- {{lib.related_artifacts(ticket)}}
+ {{lib.related_artifacts(ticket, c.user)}}
<div id="discussion_holder">
<h2>Discussion</h2>
{% set thread=ticket.discussion_thread %}
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html
b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 07b1249b4..681ee4f11 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -117,7 +117,7 @@
{% block after_content %}
<hr style="margin-top: 1em; margin-bottom: 2em; clear:both;">
- {{lib.related_artifacts(page)}}
+ {{lib.related_artifacts(page, c.user)}}
{% if page.discussion_thread and c.app.show_discussion %}
{% if h.has_access(page, 'post')() or page.discussion_thread.num_replies
> 0 %}
<div id="discussion_holder"><h2>Discussion</h2>
