scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix generation of preview url for new steps and results [SCI-694]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2016-12-20 16:10:53 +01:00
parent cbef971d85
commit 00ea3a027c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/assets.js
View file

@ -28,8 +28,8 @@ function setupAssetsLoading() {
if (data.type === "image") {
$el.html(
"<img src='" + data['preview-url'] + "' data-large-url='"
+ data['large-preview-url'] + "'><p>" +
"<img src='" + data['preview-url'] + "' data-get-preview-url='"
+ data['get-preview-url'] + "'><p>" +
data.filename + "</p>"
);
} else {

2
app/controllers/assets_controller.rb
View file

@ -20,7 +20,7 @@ class AssetsController < ApplicationController
# If check permission passes, return :ok
render json: {
'preview-url' => @asset.url(:medium),
'large-preview-url' => @asset.url(:large),
'get-preview-url' => large_image_url_asset_path(@asset),
'filename' => truncate(@asset.file_file_name,
length:
Constants::FILENAME_TRUNCATION_LENGTH),

2
app/views/results/_result_asset.html.erb
View file

@ -9,7 +9,7 @@
<%= image_tag 'medium/processing.gif' %>
</span>
<% else %>
<%= image_tag result.asset.url(:medium), data: {large_url: result.asset.url(:large)} if result.asset.is_image? %>
<%= image_tag result.asset.url(:medium), data: {'get-preview-url': large_image_url_asset_path(result.asset)} if result.asset.is_image? %>
<p><%= truncate(result.asset.file_file_name,
length: Constants::FILENAME_TRUNCATION_LENGTH) %></p>
<% end %>