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

include Harrys's new templates

Browse Source 
fix form restore
fix Version
This commit is contained in:
Jean-Yves Gaulier
2020-02-17 20:16:19 +01:00
parent 4f7be4c0a9
commit 722b1e3750
4 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Core/Version.php
View File

@@ -16,7 +16,7 @@ class Version
/** /**
* @var string * @var string
*/ */
private $number = '4.1.0-alpha.20a'; private $number = '4.1.0-alpha.21a';
/** /**
* @var string * @var string

2
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchSettingsFormType.php
View File

@@ -149,7 +149,7 @@ class ElasticsearchSettingsFormType extends AbstractType
// populate aggs to form // populate aggs to form
foreach($aggs as $k=>$agg) { foreach($aggs as $k=>$agg) {
$builder->add('aggregates:' . $k . ':limit', ChoiceType::class, $agg); $builder->add('facets:' . $k . ':limit', ChoiceType::class, $agg);
} }
} }

14
templates/web/admin/fields/templates.html.twig
View File

@@ -238,14 +238,12 @@
<label for="aggregable">{% trans %}Aggregation{% endtrans %}</label> <label for="aggregable">{% trans %}Aggregation{% endtrans %}</label>
</td> </td>
<td> <td>
<select id="aggregable"> <%= field['aggregable'] == "0" ? '{% trans %}Not aggregated{% endtrans %}' : '' %>
<option <%= field['aggregable'] == "0" ? 'selected' : '' %> value='0'>{% trans %}Not aggregated{% endtrans %}</option> <%= field['aggregable'] == "10" ? '10 values' : '' %>
<option <%= field['aggregable'] == "10" ? 'selected' : '' %> value='10'>10 values</option> <%= field['aggregable'] == "20" ? '20 values' : '' %>
<option <%= field['aggregable'] == "20" ? 'selected' : '' %> value='20'>20 values</option> <%= field['aggregable'] == "50" ? '50 values' : '' %>
<option <%= field['aggregable'] == "50" ? 'selected' : '' %> value='50'>50 values</option> <%= field['aggregable'] == "100" ? '100 values' : '' %>
<option <%= field['aggregable'] == "100" ? 'selected' : '' %> value='100'>100 values</option> <%= field['aggregable'] == "-1" ? 'All values' : '' %>
<option <%= field['aggregable'] == "-1" ? 'selected' : '' %> value='-1'>{% trans %}All values{% endtrans %}</option>
</select>
</td> </td>
</tr> </tr>
<tr> <tr>

64
templates/web/admin/search-engine/general-aggregation.html.twig
View File

@@ -1,12 +1,37 @@
<div class="general-aggregation-layout"> <div class="general-aggregation-layout">
<button type="submit" id="elasticsearch_settings_save_facets" name="elasticsearch_settings[save]"
class="btn btn-primary">{{ 'Save' | trans }}</button>
<div id="basket-filter" class="facet-filter unstyled" style="float: right; padding-top: 27px;">
{#<span class="filter-title">{{ 'See' | trans }} : </span>#}
<span class="filter-item">
<label id="aggregated-list" class="checkbox inline" for="basketFilter">
<input type="checkbox" class="checkbox " value="aggregated" checked
style="margin-top: 1px">
{{ 'Aggregated' | trans }}
</label>
</span>
<span class="filter-item" style="margin-left: 10px">
<label id="not-aggregated-list" class="checkbox inline" for="basketFilter">
<input type="checkbox" class="checkbox " value="not-aggregated" checked
style="margin-top: 1px">
{{ 'Not aggregated' | trans }}
</label>
</span>
</div>
<ul class="unstyled aggregation-collection"> <ul class="unstyled aggregation-collection">
{% for formdata in form %} {% for formdata in form %}
{% set attr = formdata.vars['attr']|join(',') %} {% set attr = formdata.vars['attr']|join(',') %}
{% set label = formdata.vars['label']|join(',') %}
{% if attr == 'aggregate' %} {% if attr == 'aggregate' %}
<li> <li id="{{ label }}" class="field-row {% if label starts with '#_' %}lightblue{% endif %}">
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td class="handle">
<i class="fa fa-arrows" aria-hidden="true"></i>
</td>
<td> <td>
{{ form_label(formdata, null, { {{ form_label(formdata, null, {
'label_attr': {'class': 'label-aggregation'} 'label_attr': {'class': 'label-aggregation'}
@@ -22,6 +47,39 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
<button type="submit" id="elasticsearch_settings_save" name="elasticsearch_settings[save]" <input type="hidden" id="listValues" name="facet_list_values"/>
class="btn btn-primary">{{ 'Save' | trans }}</button>
</div> </div>
<script type="text/javascript">
/*Add a sort for the list*/
function filterFacet() {
$.each($(".aggregate option:selected"), function () {
if ($(this).val() == 0) {
$(this).closest('.field-row').addClass('not-aggregated')
}
else {
$(this).closest('.field-row').addClass('aggregated')
}
});
$('#aggregated-list input').click(function () {
$('.aggregated').toggleClass('hidden');
});
$('#not-aggregated-list input').click(function () {
$('.not-aggregated').toggleClass('hidden');
});
}
/*Get the order of new list*/
var sortEventHandler = function (event, ui) {
$('#listValues').val(JSON.stringify($('form').serializeArray()));
};
$(document).ready(function () {
$('.lightblue .label-aggregation').css('color','mediumblue');
$('.aggregation-collection').sortable({
handle: ".handle",
stop: sortEventHandler
});
// sortEventHandler(null, null); // enforce build list
filterFacet();
$("#elasticsearch_settings_save_facets").click(function(){sortEventHandler(null, null);});
});
</script>