parent
47ae398748
commit
c2ff861fba
|
@ -43,7 +43,7 @@ class ZipdownController < ApplicationController
|
||||||
zipfile = zip_homework_by_user homework
|
zipfile = zip_homework_by_user homework
|
||||||
send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
|
send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
|
||||||
else
|
else
|
||||||
render_403 :message => :no_file_dowmload
|
render file: 'zipdown/no_file_dowmload.js.erb'
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
render_403 :message =>:notice_file_not_found
|
render_403 :message =>:notice_file_not_found
|
||||||
|
@ -52,7 +52,7 @@ class ZipdownController < ApplicationController
|
||||||
render_403 :message => :notice_not_authorized
|
render_403 :message => :notice_not_authorized
|
||||||
end
|
end
|
||||||
rescue => e
|
rescue => e
|
||||||
render file: 'public/file_not_found.html'
|
render file: 'zipdown/file_not_fond.js.erb'
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -106,7 +106,7 @@
|
||||||
<td>
|
<td>
|
||||||
<strong>提交文件:
|
<strong>提交文件:
|
||||||
<% if is_evaluation || is_teacher%>
|
<% 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 %>
|
<% else %>
|
||||||
<span class="required">未开启互评功能作业不允许下载</span>
|
<span class="required">未开启互评功能作业不允许下载</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
alert("对不起,这个文件暂时不能下载。 ");
|
|
@ -0,0 +1 @@
|
||||||
|
alert('<%=l(:no_file_dowmload)%>');
|
Loading…
Reference in New Issue