diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index 16e6ea870..9e1676474 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -43,7 +43,7 @@ class ZipdownController < ApplicationController zipfile = zip_homework_by_user homework send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile) else - render_403 :message => :no_file_dowmload + render file: 'zipdown/no_file_dowmload.js.erb' end else render_403 :message =>:notice_file_not_found @@ -52,7 +52,7 @@ class ZipdownController < ApplicationController render_403 :message => :notice_not_authorized end rescue => e - render file: 'public/file_not_found.html' + render file: 'zipdown/file_not_fond.js.erb' end private diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index b58f918df..2009d1252 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -106,7 +106,7 @@ 提交文件:  <% if is_evaluation || is_teacher%> - <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> + <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework, :remote => true%> <% else %> 未开启互评功能作业不允许下载 <% end %> diff --git a/app/views/zipdown/file_not_fond.js.erb b/app/views/zipdown/file_not_fond.js.erb new file mode 100644 index 000000000..28b6d886f --- /dev/null +++ b/app/views/zipdown/file_not_fond.js.erb @@ -0,0 +1 @@ +alert("对不起,这个文件暂时不能下载。 "); \ No newline at end of file diff --git a/app/views/zipdown/no_file_dowmload.js.erb b/app/views/zipdown/no_file_dowmload.js.erb new file mode 100644 index 000000000..372da5ac5 --- /dev/null +++ b/app/views/zipdown/no_file_dowmload.js.erb @@ -0,0 +1 @@ +alert('<%=l(:no_file_dowmload)%>'); \ No newline at end of file