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

taken account operator when searching in field

Browse Source 
save last thesaurus operator choice in session
This commit is contained in:
aynsix
2025-03-05 17:52:23 +03:00
parent 78ec10d274
commit e62e64cc6e
6 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Phraseanet-production-client/dist/production.js vendored
View File

@@ -22526,9 +22526,8 @@ var recordEditorService = function recordEditorService(services) {
}
}).on('mouseup mousedown keyup keydown', '.editor-thesaurus-search', function (event) {
var currentField = options.fieldCollection.getActiveField();
var method = (0, _jquery2.default)(event.currentTarget).siblings('select.thesaurus-search-operator').val();
onUserInputComplete(event, $searchThesaurus.val(), currentField, method);
onUserInputComplete(event, $searchThesaurus.val(), currentField);
});
};
@@ -23887,9 +23886,9 @@ var recordEditorService = function recordEditorService(services) {
* @param field
*/
var onUserInputComplete = function onUserInputComplete(event, value, field) {
var method = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'begins';
if (value !== '') {
var method = (0, _jquery2.default)('div#EDIT_MID').find('select.thesaurus-search-operator').val();
recordEditorEvents.emit('recordEditor.userInputValue', {
event: event,
value: value,

7
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -22526,9 +22526,8 @@ var recordEditorService = function recordEditorService(services) {
}
}).on('mouseup mousedown keyup keydown', '.editor-thesaurus-search', function (event) {
var currentField = options.fieldCollection.getActiveField();
var method = (0, _jquery2.default)(event.currentTarget).siblings('select.thesaurus-search-operator').val();
onUserInputComplete(event, $searchThesaurus.val(), currentField, method);
onUserInputComplete(event, $searchThesaurus.val(), currentField);
});
};
@@ -23887,9 +23886,9 @@ var recordEditorService = function recordEditorService(services) {
* @param field
*/
var onUserInputComplete = function onUserInputComplete(event, value, field) {
var method = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'begins';
if (value !== '') {
var method = (0, _jquery2.default)('div#EDIT_MID').find('select.thesaurus-search-operator').val();
recordEditorEvents.emit('recordEditor.userInputValue', {
event: event,
value: value,

7
Phraseanet-production-client/src/components/record/recordEditor/index.js
View File

@@ -219,9 +219,8 @@ const recordEditorService = services => {
})
.on('mouseup mousedown keyup keydown', '.editor-thesaurus-search', (event) => {
let currentField = options.fieldCollection.getActiveField();
let method = $(event.currentTarget).siblings('select.thesaurus-search-operator').val();
onUserInputComplete(event, $searchThesaurus.val(), currentField, method);
onUserInputComplete(event, $searchThesaurus.val(), currentField);
})
;
};
@@ -1773,8 +1772,10 @@ const recordEditorService = services => {
* @param value
* @param field
*/
let onUserInputComplete = (event, value, field, method = 'begins') => {
let onUserInputComplete = (event, value, field) => {
if (value !== '') {
let method = $('div#EDIT_MID').find('select.thesaurus-search-operator').val();
recordEditorEvents.emit('recordEditor.userInputValue', {
event,
value,

4
lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
View File

@@ -880,6 +880,8 @@ class ThesaurusXmlHttpController extends Controller
public function openBranchesHtml(Request $request)
{
$this->app['session']->set('editor_thesaurus_operator', $request->get('method'));
if (null === $mod = $request->get('mod')) {
$mod = 'TREE';
}
@@ -1458,6 +1460,8 @@ class ThesaurusXmlHttpController extends Controller
return $this->app->json(['success' => false , 'message' => 'invalid form token'], 403);
}
$this->app['session']->set('workzone_thesaurus_operator', $request->get('method'));
$lng = $request->get('lng');
$html = '';

12
templates/web/prod/actions/edit_default.html.twig
View File

@@ -272,8 +272,16 @@
{% if thesaurus %}
<div id='TH_Ofull'>
<select class="thesaurus-search-operator" tabindex="-1" aria-hidden="true" style="width: 106px; margin-left:10px; display: none;">
<option value="begins">{{ 'begins with' | trans }}</option>
<option value="contains">{{ 'contains' | trans }}</option>
<option value="begins"
{% if app['session'].has('editor_thesaurus_operator') and app['session'].get('editor_thesaurus_operator') == "begins" %}
selected
{% endif %}
>{{ 'begins with' | trans }}</option>
<option value="contains"
{% if app['session'].has('editor_thesaurus_operator') and app['session'].get('editor_thesaurus_operator') == "contains" %}
selected
{% endif %}
>{{ 'contains' | trans }}</option>
</select>
<input type="text" class="editor-thesaurus-search" style="margin-top: 10px; margin-left: 10px; display: none;">
<div class='thesaurus edit-thesaurus-action'>

12
templates/web/prod/tab_thesaurus.html.twig
View File

@@ -21,8 +21,16 @@
<form class="gform form-inline thesaurus-filter-submit-action">
<div class="input-append">
<select class="thesaurus-search-operator" tabindex="-1" aria-hidden="true" style="width: 25%; margin-left:10px; height:39px;">
<option value="begins">{{ 'begins with' | trans }}</option>
<option value="contains">{{ 'contains' | trans }}</option>
<option value="begins"
{% if app['session'].has('workzone_thesaurus_operator') and app['session'].get('workzone_thesaurus_operator') == "begins" %}
selected
{% endif %}
>{{ 'begins with' | trans }}</option>
<option value="contains"
{% if app['session'].has('workzone_thesaurus_operator') and app['session'].get('workzone_thesaurus_operator') == "contains" %}
selected
{% endif %}
>{{ 'contains' | trans }}</option>
</select>
<input type="text" name="search_value" class="input-medium thesaurus-filter-suggest-action" style="width: 55%; float:none;"/>
<button type="submit" class="th_ok btn btn-inverse" style="width:12%; float:none;">