diff --git a/app/assets/javascripts/gallery.js b/app/assets/javascripts/gallery.js index 8135aa8..012a840 100644 --- a/app/assets/javascripts/gallery.js +++ b/app/assets/javascripts/gallery.js @@ -1,18 +1,29 @@ +function init_upload(temp_length){ + var value = $("input[name='all_upload_length']") + if (value.val()==''){ + value.val(temp_length) + $.ajax({ + type : "post", + url : "/admin/galleries/init_upload", + dataType : "json", + data:{all_length: value.val()}, + async: false, + global:false, + success: function() + { + }, + error : function(data){ + alert('init upload process failed, please try again later.') + } + }); + if (value.val()=='1'){ + value.val('') + } + } +} function form_submit() { var temp_length = $('#file-list').find('li.template-upload').length - $.ajax({ - type : "post", - url : "/admin/galleries/init_upload", - dataType : "json", - data:{all_length: temp_length}, - async: false, - success: function() - { - }, - error : function(data){ - alert('init upload process failed, please try again later.') - } - }); + init_upload(temp_length) var length_upload var count_upload var send_start @@ -38,25 +49,24 @@ function form_submit() { window.location.href = '/admin/galleries/upload_process' } }) + $.ajax({ + url : "/admin/galleries/start_upload_process", + dataType : "json", + type : "post", + error: function(){ + alert('init upload process failed, please try again later.') + }, + success: function(){ + window.location.href = '/admin/galleries/upload_process' + } + }) } }); } } function form_only_one_submit() { var temp_length = 1 - $.ajax({ - type : "post", - url : "/admin/galleries/init_upload", - dataType : "json", - data:{all_length: temp_length}, - async: false, - success: function() - { - }, - error : function(data){ - alert('init upload process failed, please try again later.') - } - }); + init_upload(temp_length) } !function ($) { $.fn.checkListLength = function (param){ diff --git a/app/views/admin/galleries/show.html.erb b/app/views/admin/galleries/show.html.erb index 47bf3b3..f0eaeed 100644 --- a/app/views/admin/galleries/show.html.erb +++ b/app/views/admin/galleries/show.html.erb @@ -8,6 +8,7 @@ --> +
Images re-ordering enabled.