Merge branch 'master' into PHRAS-3869-secure-locale

alchemy-fr · Jul 12, 2023 · 3c02831 · 3c02831
2 parents bec04f4 + 12851c1
commit 3c02831
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,14 @@
 # Exclude log folder
 /logs
 
+# Exclude backup folder
+/backup
+!/backup/.gitkeep
+
+# Exclude ftp folder
+/ftp
+!/ftp/.gitkeep
+
 # Exclude plugin folder
 /plugins
 # Excluse assets plugin folder

diff --git a/lib/Alchemy/Phrasea/Helper/Prod.php b/lib/Alchemy/Phrasea/Helper/Prod.php
@@ -97,7 +97,7 @@ public function get_search_datas()
                     'sbas' => array($sbasId),
                     'fieldname' => $name,
                     'type' => $type,
-                    'label' => ($name === $label) ? [$label] : [$name . ' - ' .trim($label)],  // add the fieldname in the label
+                    'label' => ($name === $label) ? [] : [trim($label)],
                     'id' => $id
                 );
 
@@ -108,7 +108,7 @@ public function get_search_datas()
                     $dates[$name]['sbas'][] = $sbasId;
 
                     // add different label for the same field if exist
-                    if (!isset($dates[$name]['label']) || !in_array(strtolower($label), array_map('strtolower', $dates[$name]['label']))) {
+                    if ($name !== $label && (!isset($dates[$name]['label']) || !in_array(strtolower($label), array_map('strtolower', $dates[$name]['label'])))) {
                         $dates[$name]['label'][] = trim($label);
                     }
                 }
@@ -126,7 +126,7 @@ public function get_search_datas()
                     $fields[$name]['sbas'][] = $sbasId;
 
                     // add different label for the same field if exist
-                    if (!in_array(strtolower($label), array_map('strtolower', $fields[$name]['label']))) {
+                    if ($name !== $label && (!in_array(strtolower($label), array_map('strtolower', $fields[$name]['label'])))) {
                         $fields[$name]['label'][] = trim($label);
                     }
                 } else {

diff --git a/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php b/lib/Alchemy/Phrasea/Out/Module/PDFRecords.php
@@ -285,7 +285,7 @@ protected function print_thumbnailGrid($links = false)
                     );
                 }
 
-                $downloadLink = $rec->get_title(['encode'=> record_adapter::ENCODE_FOR_URI]);
+                $downloadLink = $rec->get_title(['encode'=> record_adapter::ENCODE_FOR_HTML]);
 
 
                 if ($this->canDownload && !empty($this->downloadSubdef) && $rec->has_subdef($this->downloadSubdef)

diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
@@ -587,7 +587,13 @@
                                                                 <option value="">{{ 'Select a field' | trans }}</option>
                                                                 {% for field_id, field in search_datas['fields'] %}
                                                                    {# {% if field['type'] != 'date' %}#}
-                                                                        <option class="dbx db_{{field['sbas']|join(' db_')}}" data-fieldtype="{{ field['type'] }}-FIELD" value="{{field_id}}">{{ field['label'] | join(' - ') }}</option>
+                                                                        <option class="dbx db_{{field['sbas']|join(' db_')}}" data-fieldtype="{{ field['type'] }}-FIELD" value="{{field_id}}">
+                                                                            {% if field['label'] is empty %}
+                                                                                {{ field['fieldname'] }}
+                                                                            {% else %}
+                                                                                {{ field['label'] | join('  |  ') ~ " ( " ~ field['fieldname'] ~ " )"}}
+                                                                            {% endif %}
+                                                                        </option>
                                                                     {#{% endif %}#}
                                                                 {% endfor %}
                                                             </select>
@@ -637,8 +643,13 @@
                                                             <option selected="selected"
                                                                     value="">{{ 'Rechercher dans un champ date' | trans }}</option>
                                                             {% for fieldname, date in search_datas['dates'] %}
-                                                                <option
-                                                                    class="dbx db_{{date['sbas']|join(' db_')}}" value="{{ fieldname }}">{{ date['label'] | join(' - ') }}</option>
+                                                                <option class="dbx db_{{date['sbas']|join(' db_')}}" value="{{ fieldname }}">
+                                                                    {% if date['label'] is empty %}
+                                                                        {{ fieldname }}
+                                                                    {% else %}
+                                                                        {{ date['label'] | join('  |  ') ~ " ( " ~ fieldname ~ " )" }}
+                                                                    {% endif %}
+                                                                </option>
                                                             {% endfor %}
                                                         </select>
                                                     </span>