From cabceb00645b6d5f0541a1fc9820a58e050369b9 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Wed, 16 Apr 2014 14:44:26 +0800
Subject: [PATCH] test zip down

---
 app/controllers/zipdown_controller.rb  | 8 ++++++--
 app/views/bids/_homework_list.html.erb | 2 +-
 app/views/zipdown/assort.html.erb      | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 app/views/zipdown/assort.html.erb

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 059e1189c..12f1976e0 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -10,8 +10,9 @@ class ZipdownController < ApplicationController
 			logger.error "[ZipDown#assort] ===> #{obj.class.to_s.to_sym} unKown !!"
 		end
 
-	rescue NameError,ActiveRecord::RecordNotFound => e
+	rescue NameError, ActiveRecord::RecordNotFound => e
 		logger.error "[ZipDown] ===> #{e}"
+		@error = e
 	end
 
 	private
@@ -31,7 +32,7 @@ class ZipdownController < ApplicationController
 		:type => detect_content_type(zipfile)
 	rescue Errno::ENOENT => e
 		logger.error "[Errno::ENOENT] ===> #{e}"
-
+		@error = e
 	end
 
 	def ziping files_path
@@ -50,6 +51,9 @@ class ZipdownController < ApplicationController
 			}
 		end
 		zipfile_name
+	rescue Errno=> e
+		logger.error "[zipdown#zipping] ===> #{e}"
+		@error = e
 	end
 
 	def detect_content_type(name)
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index ad2bc1c0a..05281fe0f 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -17,7 +17,7 @@
 <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), remote: false, class: "button_submit button_submit_font_white", style: "margin: 5px 10px;display: inline-block;" if( User.current.admin? || 
 				!(User.current.roles_for_project(@bid.courses.first).map(&:id) & 
 					([7,9, 10])).empty? 
-			  ) && Rails.env.development? %>
+			  ) && (true || Rails.env.development?) %>
 <% @homework_list.each do |homework|%>
 	<% if homework.attachments.any?%>
 	<table width="660px" border="0" align="center">
diff --git a/app/views/zipdown/assort.html.erb b/app/views/zipdown/assort.html.erb
new file mode 100644
index 000000000..c9056b4fa
--- /dev/null
+++ b/app/views/zipdown/assort.html.erb
@@ -0,0 +1,2 @@
+<h1>Download Status:</h1>
+<%= @error.class %>
\ No newline at end of file