Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/attachments_controller.rb

@@ -514,6 +514,8 @@ private
   end
 
   def has_login
-    render_403 unless User.current.logged?
+    unless @attachment.container_type == "PhoneAppVersion"
+      render_403 unless User.current.logged?
+    end
   end
 end

app/helpers/application_helper.rb

@@ -1824,7 +1824,9 @@ module ApplicationHelper
   def attachment_candown attachment
     candown = false
     if attachment.container
-      if attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
+      if attachment.container.class.to_s=="PhoneAppVersion"
+        candown = true
+      elsif attachment.container.class.to_s != "HomeworkAttach" && attachment.container.class.to_s != "StudentWork" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
         project = attachment.container.project
         candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
       elsif attachment.container.is_a?(Project)
@@ -1850,6 +1852,7 @@ module ApplicationHelper
         candown = true
       elsif attachment.container.class.to_s=="StudentWork"
         candown = true
+
       elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
         course = attachment.container.courses.first
         candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)