scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-01 20:48:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #456 from okriuchykhin/ok_SCI_951

Browse source 
Fix missing preview images in task and protocol management [SCI-951]
This commit is contained in:
okriuchykhin 2017-01-27 14:42:41 +01:00 committed by GitHub
commit 9909f9dcff
4 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/my_modules/results.js.erb
View file

@ -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

2
app/assets/javascripts/results/result_assets.js
View file

@ -63,8 +63,6 @@ function formAjaxResultAsset($form) {
toggleResultEditButtons(true);
expandResult($newResult);
$imgs = $newResult.find("img");
reloadImages($imgs);
initPreviewModal();
Comments.initialize();
})

13
app/assets/javascripts/sitewide/draw_components.js
View file

@ -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);
});
}

6
app/models/protocol.rb
View file

@ -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