From d1d1181a69d86ed3861147bfc3d740a35819dc9f Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 17 Mar 2020 16:52:03 +0400 Subject: [PATCH 1/2] PHRAS-2989 #comment Fix on Prod detailled view basket #time 3h --- package.json | 2 +- templates/web/prod/preview/appears_in.html.twig | 8 ++++---- yarn.lock | 16 ++++++---------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 7ce6d01a66..a989fc4cec 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.150-d", + "phraseanet-production-client": "0.34.152-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index e6087d49ab..7ebf3e5aaa 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -27,15 +27,15 @@ {##} {% if basket.getValidation() %} - + {% elseif basket.getPusher() %} {% if not basket.isRead() %} - + {% else %} - + {% endif %} {% else %} - + {% endif %} {{basket.getName()}} diff --git a/yarn.lock b/yarn.lock index 319e85d277..e34a5585e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5305,14 +5305,10 @@ jquery-simplecolorpicker@^0.3.1: resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb" integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs= -"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": - version "1.4.2" - resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" - -"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git": +"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": version "1.4.2" uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e" - resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" + resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" jquery-ui-datepicker-with-i18n@^1.10.4: version "1.10.4" @@ -7581,10 +7577,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.150-d: - version "0.34.150-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285" - integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg== +phraseanet-production-client@0.34.152-d: + version "0.34.152-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.152-d.tgz#ac2165ee1173e61789847c2b578e479bde737e86" + integrity sha512-e1+cskYWg+qNc4OSs/M9NOnBkJJpeceOGv7a6wyvw1PK/Cezv4Fp9I7apVNJov4G9agyptndzFeQfmM3fQm6YA== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 28766799be70371296b92339ff79a5263071cf70 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 19 Mar 2020 17:23:24 +0400 Subject: [PATCH 2/2] PHRAS-2989 fix dblclick on view details --- package.json | 2 +- templates/web/prod/preview/appears_in.html.twig | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a989fc4cec..77a463333a 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.152-d", + "phraseanet-production-client": "0.34.153-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/preview/appears_in.html.twig b/templates/web/prod/preview/appears_in.html.twig index 7ebf3e5aaa..988bcde86d 100644 --- a/templates/web/prod/preview/appears_in.html.twig +++ b/templates/web/prod/preview/appears_in.html.twig @@ -23,7 +23,7 @@ data-position="0" data-id="{{basket.getId()}}" data-reload="true" - class="otherBaskToolTip open-preview-action" title="{{basket.getDescription()}}"> + class="otherBaskToolTip to-open-preview-action" title="{{basket.getDescription()}}"> {##} {% if basket.getValidation() %} diff --git a/yarn.lock b/yarn.lock index e34a5585e5..442ca700e1 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.152-d: - version "0.34.152-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.152-d.tgz#ac2165ee1173e61789847c2b578e479bde737e86" - integrity sha512-e1+cskYWg+qNc4OSs/M9NOnBkJJpeceOGv7a6wyvw1PK/Cezv4Fp9I7apVNJov4G9agyptndzFeQfmM3fQm6YA== +phraseanet-production-client@0.34.153-d: + version "0.34.153-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.153-d.tgz#3014c7345cad2f3f106975805e5b8db5e8db3d56" + integrity sha512-IX5oVB4MmI/PE9iDkeuuXdjfoJd4q4SdFxHuGLswyT0PWxZhIzLT7D2zNc77ULpcnX9KnvCs6wIEIn4UbKC0pQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"