From b35c1595edc0e018d00422b3abeae0e4aca66ab1 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 19 Feb 2020 15:20:19 +0400 Subject: [PATCH 01/32] PHRAS-2933 Fix facets order and move to workzone block --- package.json | 2 +- templates/web/prod/index.html.twig | 54 +++++++++++++++++------------- yarn.lock | 9 +++-- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 34944f5377..7fad145f59 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.135-d", + "phraseanet-production-client": "0.34.137-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 7fb2455fde..9a01b5ee62 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -183,6 +183,36 @@ {% if GV_thesaurus %}
+
+
+

{{ 'index::advance_search: facet-order' | trans }}

+
+ {% set order_facet = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'order_facet') %} + +
+
+
+

{{ 'index::advance_search: facet-values-order' | trans }}

+
+ {% set facet_values_order = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'facet_values_order') %} + +
+
+
{% include 'prod/tab_thesaurus.html.twig' with {has_access_to_module: app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus')} %} @@ -814,30 +844,6 @@

{{ 'index::advance_search: facet' | trans }}

-

{{ 'index::advance_search: facet-order' | trans }}

-
- {% set order_facet = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'order_facet') %} - -
-

{{ 'index::advance_search: facet-values-order' | trans }}

-
- {% set facet_values_order = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'facet_values_order') %} - -
{% set facetFilter = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'facet') %}