summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-01 15:57:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-01 15:57:01 +0000
commit4c312f3d6b67a537945a85ee90d2262fa7d32a96 (patch)
tree3ca5dbf7ed3f44b5106838a39e612973375da5cf /app/helpers
parentcbdf9006293da40516c4a25025a52f02fa7700e9 (diff)
downloadredmine-4c312f3d6b67a537945a85ee90d2262fa7d32a96.tar.gz
redmine-4c312f3d6b67a537945a85ee90d2262fa7d32a96.zip
Show line breaks in activity events summary.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2347 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3bdb6e2eb..27930ac94 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -116,7 +116,7 @@ module ApplicationHelper
end
def format_activity_description(text)
- h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
+ h(truncate(text.to_s, 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />")
end
def distance_of_date_in_words(from_date, to_date = 0)