diff --git a/app/assets/javascripts/my_modules/results.js.erb b/app/assets/javascripts/my_modules/results.js.erb index 514b5dae2..7824bebde 100644 --- a/app/assets/javascripts/my_modules/results.js.erb +++ b/app/assets/javascripts/my_modules/results.js.erb @@ -163,8 +163,11 @@ function processResult(ev, resultTypeEnum, editMode) { var nameValid = textValidator(ev, $nameInput, 0, <%= Constants::NAME_MAX_LENGTH %>); var $fileInput = $form.find("#result_asset_attributes_file"); - var filesValid = filesValidator(ev, $fileInput, FileTypeEnum.FILE, - editMode); + var filesValid = true; + if ($fileInput.val()) { + filesValid = filesValidator(ev, $fileInput, FileTypeEnum.FILE, + editMode); + } if(nameValid && filesValid) { // Local file uploading diff --git a/app/assets/javascripts/results/result_assets.js b/app/assets/javascripts/results/result_assets.js index 4ef6c4beb..001fe0ebb 100644 --- a/app/assets/javascripts/results/result_assets.js +++ b/app/assets/javascripts/results/result_assets.js @@ -63,8 +63,6 @@ function formAjaxResultAsset($form) { toggleResultEditButtons(true); expandResult($newResult); - $imgs = $newResult.find("img"); - reloadImages($imgs); initPreviewModal(); Comments.initialize(); }) diff --git a/app/assets/javascripts/sitewide/draw_components.js b/app/assets/javascripts/sitewide/draw_components.js deleted file mode 100644 index 520795cca..000000000 --- a/app/assets/javascripts/sitewide/draw_components.js +++ /dev/null @@ -1,13 +0,0 @@ -/* - * By adding unique attribute to image's src, we - * force browser to reload/update cached image - * (useful for AJAX calls). - */ -function reloadImages(imgs) { - _.each(imgs, function (img) { - var src = $(img).attr("src"); - src = src.split("?", 1); - src += "?timestamp=" + new Date().getTime(); - $(img).attr("src", src); - }); -} diff --git a/app/models/protocol.rb b/app/models/protocol.rb index 42311191c..6a029e038 100644 --- a/app/models/protocol.rb +++ b/app/models/protocol.rb @@ -262,10 +262,14 @@ class Protocol < ActiveRecord::Base ) asset2.created_by = current_user asset2.last_modified_by = current_user + asset2.file_processing = true if asset.is_image? asset2.save step2.assets << asset2 - asset2.file.delay.reprocess!(:medium) + if asset.is_image? + asset2.file.delay.reprocess!(:large) + asset2.file.delay.reprocess!(:medium) + end assets_to_clone << [asset.id, asset2.id] end