jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into 'develop' 

作品列表导出作品附件大于200M提示



See merge request !110
This commit is contained in:
黄井泉 2017-01-06 14:50:05 +08:00
parent a2bc649a56 0be2dbe10b
commit 866d44c568
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/services/zip_service.rb
View File

@ -1,5 +1,8 @@
require "base64" require "base64"
require 'zip' require 'zip'
SAVE_FOLDER = "#{Rails.root}/files"
OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
MAX_PATH = 50
module ZipService module ZipService
def zip_bid(bid) def zip_bid(bid)

10
public/javascripts/application.js
View File

@ -942,6 +942,14 @@ $(function(){
$('a.tb_all').bind('ajax:complete', function (event, data, status, xhr) { $('a.tb_all').bind('ajax:complete', function (event, data, status, xhr) {
if(status == 'success'){ if(status == 'success'){
var res = JSON.parse(data.responseText); var res = JSON.parse(data.responseText);
if(res.err == -1){
var htmlvalue = '<div id="muban_popup_box" style="width:auto;"><div class="muban_popup_top"><h3 class="fl">温馨提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
'<div class="clear mt15 mr10 ml10"><p class="text_c f14">因附件资源太大，请通过微信或者QQ联系Trustie管理员</br>辅助您完成下载</p><div class="cl"></div>'+
'<a href="javascript:void(0);" class="fr sy_btn_blue mt10" style="margin-right: 143px;" onclick="hideModal();">确&nbsp;&nbsp;定</a></div></div>';
pop_box_new(htmlvalue,380,166);
return;
}
if(res.length<1){ if(res.length<1){
return; return;
} }
@ -974,7 +982,7 @@ $(function(){
}); });
$('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) { $('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
if(status == 'success'){ if(status == 'success'){
var res = JSON.parse(data.responseText); var res = JSON.parse(data.responseText);
if(res.length == null){ if(res.length == null){
alert("该作业没有任何附件可下载"); alert("该作业没有任何附件可下载");
} }