issue动态附件点击后下载更新为直接查看

This commit is contained in:
cxt 2016-10-24 10:57:40 +08:00
parent 3bc11cd5be
commit 40a895a786
3 changed files with 17 additions and 8 deletions

View File

@ -36,7 +36,7 @@ module AttachmentsHelper
end
def link_to_attachment_project(container, options = {})
options.assert_valid_keys(:author, :thumbnails)
options.assert_valid_keys(:deletable, :author, :thumbnails)
if container.attachments.any?
options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)

View File

@ -106,14 +106,14 @@
<% end %>
</p>
<% end %>
<div class="thumbnails">
<% if defined?(thumbnails) && thumbnails %>
<% if defined?(thumbnails) && thumbnails %>
<div class="thumbnails">
<% images = attachments.select(&:thumbnailable?) %>
<% if images.any? %>
<% images.each do |attachment| %>
<div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
<% end %>
<% end %>
<% end %>
</div>
</div>
<% end %>
</div>

View File

@ -89,9 +89,18 @@
<% end %>
<% end %>
<div class="cl"></div>
<div class="mt10" style="font-weight:normal;">
<%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
</div>
<% if activity.attachments.any? %>
<div id="div_issue_attachment_<%=user_activity_id %>" style="margin-top: -10px; margin-bottom: -20px;">
<div>
<a href="javascript:void(0)" class="link_img fl">
<!--显示附件、图片-->
<%= link_to_attachment_project activity,:deletable => false, :author => true, :thumbnails => false %>
</a><br/>
<%= call_hook(:view_issues_show_description_bottom, :issue => activity) %>
</div><!--pro_pic_box end-->
<div class="cl"></div>
</div>
<% end %>
</div>
<div class="cl"></div>
</div>