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