From 661f09e3fdc0b405abd8bcdda9756bd937982849 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 2 Apr 2020 11:52:52 +0400 Subject: [PATCH] PHRAS-3006 #comment port 41 Front elete 3 by 3 --- package.json | 2 +- .../actions/delete_records_confirm.html.twig | 225 +++++++++++++----- .../delete_records_confirm_form.html.twig | 48 ++++ yarn.lock | 8 +- 4 files changed, 215 insertions(+), 68 deletions(-) create mode 100644 templates/web/prod/actions/delete_records_confirm_form.html.twig diff --git a/package.json b/package.json index 232c24d86b..9bf367299b 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.160-d", + "phraseanet-production-client": "0.34.161-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/actions/delete_records_confirm.html.twig b/templates/web/prod/actions/delete_records_confirm.html.twig index d65e1e4550..61984cce5f 100644 --- a/templates/web/prod/actions/delete_records_confirm.html.twig +++ b/templates/web/prod/actions/delete_records_confirm.html.twig @@ -1,67 +1,166 @@ -{% set nbReceived = records.received().count() %} -{% set nbEligibleDocuments = records.count() %} +{% if with_children.records.stories().count() > 0 %} + +{% endif %} -{% set nbTrash = filteredRecord.trash|length %} -{% set nbDelete = filteredRecord.delete|length %} +
+ {{ include('prod/actions/delete_records_confirm_form.html.twig', parents_only) }} +
-{% if nbEligibleDocuments > 0 %} - {% if nbReceived != records.count() %} -
- {{ "You do not have rights to remove all selected documents. Are you sure ?" | trans }} -
- {% endif %} +
+ {{ include('prod/actions/delete_records_confirm_form.html.twig', with_children) }} +
-
- - {% if nbTrash > 0 %} -
-
- -
-
- {{ nbTrash }} {{ "prod:app trash: record-move-to-trash" | trans }} -
- {% if records.stories().count() %} - - {% endif %} -
- {% endif %} - {% if nbDelete > 0 %} -
-
- -
-
- {{ nbDelete }} {{ "prod:app trash: record-delete" | trans }} -
- {% if records.stories().count() %} - - {% endif %} -
- {% endif %} -
- - - -
-
-{% elseif nbReceived == 0 %} -
- {{ "No document selected" | trans }} -
-{% else %} -
- {{ "You do not have rights to remove selected documents" | trans }} -
-{% endif %} \ No newline at end of file + \ No newline at end of file diff --git a/templates/web/prod/actions/delete_records_confirm_form.html.twig b/templates/web/prod/actions/delete_records_confirm_form.html.twig new file mode 100644 index 0000000000..f24f25570b --- /dev/null +++ b/templates/web/prod/actions/delete_records_confirm_form.html.twig @@ -0,0 +1,48 @@ +{% if records.count() > 0 %} + {% if records.rejected().count() > 0 %} +
+ {{ "You do not have rights to remove all selected documents. Are you sure ?" | trans }} +
+ {% endif %} + +
+ + {% if trashableCount > 0 %} +
+
+ +
+
+ {{ trashableCount }} {{ "prod:app trash: record-move-to-trash" | trans }} +
+
+ {% endif %} + {% if deletableCount > 0 %} +
+
+ +
+
+ {{ deletableCount }} {{ "prod:app trash: record-to-delete" | trans }} +
+
+ {% endif %} +
+ + + +
+
+{% elseif records.received().count() == 0 %} +
+ {{ "No document selected" | trans }} +
+{% else %} +
+ {{ "You do not have rights to remove selected documents" | trans }} +
+{% endif %} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 4a5be0c837..8e2772476a 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.160-d: - version "0.34.160-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.160-d.tgz#3deb3387b54e56aec73b073cae8cc013cc316999" - integrity sha512-00jnCOCDrLowL8TE+h8mH+Lg4P0+EQPSDOXN2Lq6KF577GGu0OWQRh2YmUeXkacHTUT4N0u39IsBkkBYqorVnQ== +phraseanet-production-client@0.34.161-d: + version "0.34.161-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.161-d.tgz#f0b93e342af25d3064562c1420f24514bb5a94f9" + integrity sha512-3nfnMjLctLp5LysO83uuWSrHQ71b+dKd4Tt8mcHV1zQcYKkXQkcXYI5/UBCna/im83zNtpz2/tSPKw5h3j3TDg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"