You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2018/02/27 23:15:35 UTC
[2/3] allura git commit: [#8189] Fix poor perf on forum listings page,
due to unintended trip of ming RelationProperty
[#8189] Fix poor perf on forum listings page, due to unintended trip of ming RelationProperty
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/17c10642
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/17c10642
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/17c10642
Branch: refs/heads/master
Commit: 17c1064267eec1dbf1055d3857b173c3d5b4696e
Parents: 14d4fe1
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Mon Feb 26 09:30:33 2018 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Feb 27 18:02:50 2018 -0500
----------------------------------------------------------------------
Allura/allura/lib/widgets/discuss.py | 2 +-
Allura/allura/templates/widgets/subscription_form.html | 2 +-
ForgeDiscussion/forgediscussion/widgets/forum_widgets.py | 4 +++-
docker-compose.yml | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/17c10642/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 76035d7..0a7e8b9 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -221,7 +221,7 @@ class SubscriptionForm(ew.SimpleForm):
class fields(ew_core.NameList):
page_list = ffw.PageList()
page_size = ffw.PageSize()
- threads = _ThreadsTable()
+ _threads = _ThreadsTable()
def resources(self):
for r in super(SubscriptionForm, self).resources():
http://git-wip-us.apache.org/repos/asf/allura/blob/17c10642/Allura/allura/templates/widgets/subscription_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/subscription_form.html b/Allura/allura/templates/widgets/subscription_form.html
index c03f8d2..f86e3b3 100644
--- a/Allura/allura/templates/widgets/subscription_form.html
+++ b/Allura/allura/templates/widgets/subscription_form.html
@@ -24,7 +24,7 @@
<div class="pagination_size">{{ pager_widget_output }}</div>
{% endif %}
<form method="{{method}}" action="{{action}}" {% if enctype %}enctype="{{enctype}}"{% endif %} class="follow_form">
- {{widget.fields['threads'].display(value=threads)}}
+ {{widget.fields['_threads'].display(value=threads)}}
{% if threads and not c.user.is_anonymous() and
not c.subscribed and not c.tool_subscribed %}
<p>
http://git-wip-us.apache.org/repos/asf/allura/blob/17c10642/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
index 7eb0fc5..3dbe2c7 100644
--- a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
+++ b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
@@ -48,7 +48,9 @@ class _ThreadsTable(DW._ThreadsTable):
class ThreadSubscriptionForm(DW.SubscriptionForm):
class fields(ew_core.NameList):
- threads = _ThreadsTable()
+ # Careful! using the same name as the prop on the model will invoke the RelationalProperty,
+ # causing all related entities to be (re)fetched.
+ _threads = _ThreadsTable()
page_list = ffw.PageList()
page_size = ffw.PageSize()
http://git-wip-us.apache.org/repos/asf/allura/blob/17c10642/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index b91a0a0..9741b93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,6 +27,7 @@ services:
volumes: &volumes
- .:/allura # Allura source code from local host
- /allura-data:/allura-data # for virtualenv, scm repos, etc
+ - /allura-data/root/home:/root # for persistent home dir, mainly for pudb
links:
- mongo
- solr