summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2024-05-15 14:07:06 +0000
committerGo MAEDA <maeda@farend.jp>2024-05-15 14:07:06 +0000
commit6e5bf96afd15aa8d7cd68e062a9386b32476804b (patch)
tree8ce5b7e35b2a69194be7e334d102330063e09861
parent4ec21ecdf5feda099796235bdc45917871ddada7 (diff)
downloadredmine-6e5bf96afd15aa8d7cd68e062a9386b32476804b.tar.gz
redmine-6e5bf96afd15aa8d7cd68e062a9386b32476804b.zip
Merged r22829 from trunk to 5.1-stable (#40610).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22831 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/projects_queries_helper.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/projects_queries_helper.rb b/app/helpers/projects_queries_helper.rb
index 331957651..dc540a432 100644
--- a/app/helpers/projects_queries_helper.rb
+++ b/app/helpers/projects_queries_helper.rb
@@ -27,7 +27,13 @@ module ProjectsQueriesHelper
(tag.span(class: 'icon icon-user my-project', title: l(:label_my_projects)) if User.current.member_of?(item)) +
(tag.span(class: 'icon icon-bookmarked-project', title: l(:label_my_bookmarks)) if User.current.bookmarked_project_ids.include?(item.id))
when :short_description
- item.description? ? content_tag('div', textilizable(item, :short_description), :class => "wiki") : ''
+ if item.description?
+ # Sets :inline_attachments to false to avoid performance issues
+ # caused by unnecessary loading of attachments
+ content_tag('div', textilizable(item, :short_description, :inline_attachments => false), :class => 'wiki')
+ else
+ ''
+ end
when :homepage
item.homepage? ? content_tag('div', textilizable(item, :homepage), :class => "wiki") : ''
when :status