Merge branch 'dev_shcool' into develop

app/helpers/application_helper.rb

@@ -2169,7 +2169,7 @@ module ApplicationHelper
         candown= User.current.member_of_course?(course) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
       elsif attachment.container.is_a?(OrgSubfield)
         org = attachment.container.organization
-        candown = User.current.member_of_org?(org) || (attachment.is_public == 1) || attachment.get_status_by_attach(User.current.id) == 2
+        candown = User.current.member_of_org?(org) || ((attachment.is_public == 1 || attachment.get_status_by_attach(User.current.id) == 2) && org.allow_guest_download == true)
       elsif attachment.container.is_a?(OrgDocumentComment)
         org = attachment.container.organization
         candown = org.allow_guest_download || User.current.member_of_org?(org) || (org.is_public && attachment.is_public == 1)

app/helpers/organizations_helper.rb

@@ -18,6 +18,12 @@ module OrganizationsHelper
       s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end
 
+  # 获取项目动态更新时间
+  def get_forge_act_message(act, type)
+    forge_act = ForgeActivity.where(:forge_act_id => act.id, :forge_act_type => type).first
+    format_time(forge_act.nil? ? act.created_on : forge_act.try(:updated_at))
+  end
+
   def get_default_name field
     case field.name
       when 'activity' then

app/views/attachments/_activity_attach.html.erb

@@ -3,7 +3,7 @@
         <div class="break_word">
           <span class="fl">
           <span title="<%= attachment.filename %>" id="attachment_<%=attachment.id %>">
-            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw380', :download => true -%>
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw380', :download => true %>
           </span>
           </span>
           <span class="postAttSize">(

app/views/users/_project_message.html.erb

@@ -29,7 +29,7 @@
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+        更新时间：<%= get_forge_act_message(activity, activity.class) %>
       </div>
       <div class="cl"></div>
       <% if activity.parent_id.nil? %>