From 2b15159fa2c0ca751026b025637c8f2fe0db50f3 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 24 Jan 2020 10:54:53 +0400 Subject: [PATCH] PHRAS-2719 --- package.json | 2 +- templates/web/common/preview.html.twig | 6 +++++- templates/web/prod/actions/edit_default.html.twig | 7 ++++--- yarn.lock | 8 ++++---- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index cdc083bedc..8c51a0798e 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.109-d", + "phraseanet-production-client": "0.34.110-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/common/preview.html.twig b/templates/web/common/preview.html.twig index 0dba1f0cfd..90898e454c 100644 --- a/templates/web/common/preview.html.twig +++ b/templates/web/common/preview.html.twig @@ -15,7 +15,11 @@ {% set previewHtml5 = null %} -{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.has_preview == true %} +{# first check if type audio and there is no preview , fallback to thumbnail #} + +{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.getType == 'audio' and record.has_preview == false %} + {% set preview_obj = record.get_thumbnail() %} +{% elseif app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') %} {% set preview_obj = record.get_preview() %} {% else %} {% set preview_obj = record.get_thumbnail() %} diff --git a/templates/web/prod/actions/edit_default.html.twig b/templates/web/prod/actions/edit_default.html.twig index 96fd7de7f2..acc218ee88 100644 --- a/templates/web/prod/actions/edit_default.html.twig +++ b/templates/web/prod/actions/edit_default.html.twig @@ -73,9 +73,9 @@ - {% endmacro %} @@ -477,4 +477,5 @@ {% endfor %} ] }; + diff --git a/yarn.lock b/yarn.lock index 173495d240..f7b2e96374 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.109-d: - version "0.34.109-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.109-d.tgz#9c48a3a4edabe146351ec36acfa3c9ef2eeddee4" - integrity sha512-AA7b72bWddguCH8jbBtFFsqKTrnfcRAfB8JjJIkUJ/fbZe3FSmDCh0nzPUhc9LbLfzKsmYVIVIZE6zkzlDUyfA== +phraseanet-production-client@0.34.110-d: + version "0.34.110-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.110-d.tgz#6ccef1446ba321c15db80898b1d32968cc97cafa" + integrity sha512-pAQ4KcbMOaPnY7qr7pOmaAfCE+ULhK0tFQksbmTyTmIBP0vP9IXziWtYhd77pYt3h4yqdohytsaAXHZyO4KIbQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"