hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-2386-Feedback_result_display

Browse Source
This commit is contained in:
Nicolas Maillat
2019-06-04 17:26:01 +02:00
committed by GitHub
parent cd62c6524b fbda66f4e7
commit 70cbee6b76
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
View File

@@ -41,7 +41,8 @@ class DisplaySettingService
'css' => '000000', 'css' => '000000',
'start_page_query' => '', 'start_page_query' => '',
'order_collection_by' => self::ORDER_BY_ADMIN, 'order_collection_by' => self::ORDER_BY_ADMIN,
'start_page' => 'QUERY', 'start_page' => 'LAST_QUERY',
'last_jsonquery' => '',
'rollover_thumbnail' => 'caption', 'rollover_thumbnail' => 'caption',
'technical_display' => '1', 'technical_display' => '1',
'doctype_display' => '1', 'doctype_display' => '1',

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "^0.34.15-d", "phraseanet-production-client": "^0.34.16-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

7
templates/web/prod/index.html.twig
View File

@@ -270,7 +270,12 @@
{% set startq = startq ~ "\",\"enabled\":true}]}}" %} {% set startq = startq ~ "\",\"enabled\":true}]}}" %}
<div id="FIRST_QUERY_CONTAINER" class="start-query" style="display: none" data-format="json">{{ startq | raw }}</div> <div id="FIRST_QUERY_CONTAINER" class="start-query" style="display: none" data-format="json">{{ startq | raw }}</div>
{% elseif app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page') == 'LAST_QUERY' %} {% elseif app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page') == 'LAST_QUERY' %}
<div id="FIRST_QUERY_CONTAINER" class="last-query" style="display: none" data-format="json">{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'last_jsonquery') | raw}}</div> {% set startq = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'last_jsonquery') %}
{% if startq is empty %}
{% set startq = "{\"query\":{\"_ux_zone\":\"\",\"type\":\"CLAUSES\",\"must_match\":\"ALL\",\"enabled\":true,\"clauses\":[{\"_ux_zone\":\"FULLTEXT\",\"type\":\"FULLTEXT\",\"value\":\"" %}
{% set startq = startq ~ "\",\"enabled\":true}]}}" %}
{% endif %}
<div id="FIRST_QUERY_CONTAINER" class="last-query" style="display: none" data-format="json">{{ startq | raw }}</div>
{% endif %} {% endif %}
<form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query"> <form id="searchForm" method="POST" action="{{ path('prod_query') }}" name="phrasea_query" class="phrasea_query">
<input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_query')}}"> <input id="SENT_query" name="qry" type="hidden" value="{{app['settings'].getUserSetting(app.getAuthenticatedUser(), 'start_page_query')}}">

8
yarn.lock
View File

@@ -7560,10 +7560,10 @@ phraseanet-common@^0.4.1:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@^0.34.15-d: phraseanet-production-client@^0.34.16-d:
version "0.34.15-d" version "0.34.16-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.15-d.tgz#58335ce4747e00b58d2b31f1e1f61c4e9c0ebfb0" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.16-d.tgz#981927b4475927f83a7bde98d704ec57686af189"
integrity sha512-BQHPj7tO285KawxZh+M7ki2aKKqFil+pHxSgdFXcpPmfHqV4vyew7h2QL4XL8E6fu18tKIxxpQ6k2EDrKeCO4w== integrity sha512-Jvapwr63VBYcYlcMQ3OEV3jcCjmWYCt2EtFFLX8YRKQhf+drT1JfERj069lDTtoc3fSGAz5MUaZF/R5EvPDY1Q==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"