| @@ -1,16 +1,16 | |||
|
|
1 |
# |
|
|
|
2 |
# Copyright (C) 2006-20 |
|
|
|
1 | # Redmine - project management software | |
|
|
2 | # Copyright (C) 2006-2011 Jean-Philippe Lang | |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 |
# |
|
|
|
8 | # | |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 |
# |
|
|
|
13 | # | |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
| @@ -21,13 +21,13 module AttachmentsHelper | |||
|
|
21 | 21 | # :author -- author names are not displayed if set to false |
|
|
22 | 22 | def link_to_attachments(container, options = {}) |
|
|
23 | 23 | options.assert_valid_keys(:author) |
|
|
24 | ||
|
|
24 | ||
|
|
25 | 25 | if container.attachments.any? |
|
|
26 | 26 | options = {:deletable => container.attachments_deletable?, :author => true}.merge(options) |
|
|
27 | 27 | render :partial => 'attachments/links', :locals => {:attachments => container.attachments, :options => options} |
|
|
28 | 28 | end |
|
|
29 | 29 | end |
|
|
30 | ||
|
|
30 | ||
|
|
31 | 31 | def to_utf8(str) |
|
|
32 | 32 | if str.respond_to?(:force_encoding) |
|
|
33 | 33 | str.force_encoding('UTF-8') |
| @@ -35,7 +35,7 module AttachmentsHelper | |||
|
|
35 | 35 | else |
|
|
36 | 36 | return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii |
|
|
37 | 37 | end |
|
|
38 | ||
|
|
38 | ||
|
|
39 | 39 | begin |
|
|
40 | 40 | Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3] |
|
|
41 | 41 | rescue Iconv::InvalidEncoding |
General Comments 0
You need to be logged in to leave comments.
Login now