From 5f7052a3488e08cb5ac231e13ee288e85bad8e50 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 11:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dforge=E5=92=8Ccourse=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E7=9A=84=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=E7=9A=84BUG=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb     |  2 +-
 app/views/attachments/_links.html.erb | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef18793ab..1b0f25fcf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,7 +127,7 @@ module ApplicationHelper
   # * :text - Link text (default to attachment filename)
   # * :download - Force download (default: false)
   def link_to_attachment(attachment, options={})
-    text = options.delete(:text) || attachment.filename
+    text = h(truncate(options.delete(:text) || attachment.filename, length: 60, omission: '...'))
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
     html_options = options.slice!(:only_path)
     url = send(route_method, attachment, attachment.filename, options)
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index b9d91d5b5..4c4065d09 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -6,8 +6,10 @@
   </span>
   <% if attachment.is_text? %>
     <%= link_to image_tag('magnifier.png'),
-                :controller => 'attachments', :action => 'show',
-                :id => attachment, :filename => attachment.filename %>
+                :controller => 'attachments',
+                :action => 'show',
+                :id => attachment,
+                :filename => attachment.filename%>
   <% end %>
   <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
@@ -18,13 +20,6 @@
                                          :method => :delete,
                                          :class => 'delete',
                                          :title => l(:button_delete) %>
-    <%# elsif attachment.container_type == 'Softapplication'%>
-      <%#= link_to image_tag('delete.png'), delete_softapplications_attachments_path(:id => attachment.id),
-                  :data => {:confirm => l(:text_are_you_sure)},
-                  :method => :delete,
-                  :class => 'delete',
-                  :remote => true,
-                  :title => l(:button_delete) %>
     <% else %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                          :data => {:confirm => l(:text_are_you_sure)},