heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force evaluation of Query() through count()

Browse Source 
Otherwise "blogs" is a query that evaluates to true, even if the user
has no blogs. This fixes the bug that the blog link is shown on a user's
profile page even if she has no blogs at all.
This commit is contained in:
Sebastian Spaeth 2013-12-12 18:03:47 +01:00
parent c518d5421d
commit 461cd7c10d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/media_types/blog/__init__.py
View File

@ -103,9 +103,10 @@ class BlogPostMediaManager(MediaManagerBase):
return blog return blog
def add_to_user_home_context(context): def add_to_user_home_context(context):
"""Inject a user's blogs into a (user home page) template context"""
blogs = context['request'].db.Blog.query.filter_by(author=context['user'].id) blogs = context['request'].db.Blog.query.filter_by(author=context['user'].id)
if blogs: if blogs.count():
context['blogs'] = blogs context['blogs'] = blogs
else: else:
context['blogs'] = None context['blogs'] = None

7
mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_blogs_dashboard.html
View File

@ -14,14 +14,11 @@
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
#} #}{#This injects the URL to a user's blog dashboard on her profile.#}
{#This injects the URL to a user's blog dashboard on her profile.
#}
{%if blogs %} {%if blogs %}
<h3>Blog</h3> <h3>Blog</h3>
{% set blogs_url = request.urlgen('mediagoblin.media_types.blog.blog_admin_dashboard', {% set blogs_url = request.urlgen('mediagoblin.media_types.blog.blog_admin_dashboard',
blogs=blogs, user=user.username) %} blogs=blogs, user=user.username) %}
<p><a href="{{ blogs_url }}"><em>Go to blogs</em></a></p> <p><a href="{{ blogs_url }}"><em>Go to user's blog</em></a></p>
{%endif%} {%endif%}