Compare commits
5
Commits
f5b75f05e4
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0036cc14d5 | ||
|
|
3d9b1d7f83 | ||
|
|
3e895178f5 | ||
|
|
66fd01e923 | ||
|
|
9fba350971 |
@@ -21,6 +21,26 @@ function thalim_archive_excluded_cat_ids( bool $exclude_seances = true ): array
|
||||
return array_values( array_filter( $ids ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Formes à chercher en base pour un texte saisi : la comparaison SQL ne confond
|
||||
* ni l'apostrophe droite et la courbe, ni « & » et sa forme enregistrée « & »
|
||||
* (l'admin enregistre « & », les anciens imports ont gardé « & »).
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
function thalim_search_text_variants( string $text ): array {
|
||||
$variants = [ $text ];
|
||||
if ( strpos( $text, "'" ) !== false || strpos( $text, '’' ) !== false ) {
|
||||
$variants = [ str_replace( '’', "'", $text ), str_replace( "'", '’', $text ) ];
|
||||
}
|
||||
if ( strpos( $text, '&' ) !== false ) {
|
||||
foreach ( $variants as $variant ) {
|
||||
$variants[] = str_replace( '&', '&', $variant );
|
||||
}
|
||||
}
|
||||
return array_values( array_unique( $variants ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Lit et assainit les filtres communs passés en GET sur les archives.
|
||||
*/
|
||||
|
||||
+76
-20
@@ -16,11 +16,14 @@
|
||||
* trou est côté sauvegarde admin. Ce hook comble ce trou pour toutes les
|
||||
* origines de save.
|
||||
*
|
||||
* Stratégie : APPEND-ONLY. On n'ajoute que les termes présents dans le champ
|
||||
* Pods mais absents de la taxonomie native. On ne retire jamais de terme —
|
||||
* ainsi aucun risque de détruire des assignations posées par ailleurs (ex.
|
||||
* post_tag issus du matching HAL). La contrepartie (un terme retiré du champ
|
||||
* Pods reste en taxonomie native) est un moindre mal, très rare ici.
|
||||
* Stratégie : COMPARAISON AVANT/APRÈS. Le champ Pods est lu avant sa sauvegarde
|
||||
* (priorité 1, Pods écrit en priorité 10) et après (priorité 99) :
|
||||
* - un terme présent dans le champ mais absent de la taxonomie native est ajouté ;
|
||||
* - un terme qui était dans le champ et n'y est plus (décoché) est retiré.
|
||||
* On ne retire donc que ce qui vient d'être décoché. Un terme natif qui n'a
|
||||
* jamais figuré dans le champ Pods (ex. ancien import) n'est pas touché.
|
||||
* Contrepartie : pour nettoyer un terme natif resté orphelin (décoché avant ce
|
||||
* correctif), il faut le recocher, enregistrer, le décocher, enregistrer.
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
@@ -39,37 +42,90 @@ function thalim_pod_tax_sync_fields(): array {
|
||||
];
|
||||
}
|
||||
|
||||
add_action( 'save_post', 'thalim_snapshot_pods_taxonomy_fields', 1, 2 );
|
||||
add_action( 'save_post', 'thalim_sync_pods_taxonomy_relations', 99, 2 );
|
||||
|
||||
/**
|
||||
* Le post est-il concerné par la synchronisation ?
|
||||
*/
|
||||
function thalim_pod_tax_sync_applies( $post_id, $post ): bool {
|
||||
return $post instanceof WP_Post
|
||||
&& 'post' === $post->post_type
|
||||
&& ! wp_is_post_revision( $post_id )
|
||||
&& ! wp_is_post_autosave( $post_id );
|
||||
}
|
||||
|
||||
/**
|
||||
* Valeurs d'un champ Pods (une ligne postmeta par term_id).
|
||||
*
|
||||
* @return int[]
|
||||
*/
|
||||
function thalim_pod_tax_field_ids( $post_id, string $field ): array {
|
||||
return array_values( array_unique( array_filter(
|
||||
array_map( 'intval', (array) get_post_meta( $post_id, $field ) )
|
||||
) ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Calcule les termes natifs à ajouter et à retirer (fonction pure).
|
||||
*
|
||||
* @param int[] $before Champ Pods avant la sauvegarde.
|
||||
* @param int[] $after Champ Pods après la sauvegarde.
|
||||
* @param int[] $native Termes natifs actuellement assignés.
|
||||
* @return array{add: int[], remove: int[]}
|
||||
*/
|
||||
function thalim_pod_tax_sync_diff( array $before, array $after, array $native ): array {
|
||||
return [
|
||||
'add' => array_values( array_diff( $after, $native ) ),
|
||||
'remove' => array_values( array_intersect( array_diff( $before, $after ), $native ) ),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Mémorise le contenu des champs avant que Pods ne les réécrive.
|
||||
* En cas de sauvegarde imbriquée, on garde l'état de la sauvegarde la plus externe.
|
||||
*/
|
||||
function thalim_snapshot_pods_taxonomy_fields( $post_id, $post ) {
|
||||
if ( ! thalim_pod_tax_sync_applies( $post_id, $post ) || isset( $GLOBALS['thalim_pod_tax_before'][ $post_id ] ) ) {
|
||||
return;
|
||||
}
|
||||
foreach ( thalim_pod_tax_sync_fields() as $field => $taxonomy ) {
|
||||
$GLOBALS['thalim_pod_tax_before'][ $post_id ][ $field ] = thalim_pod_tax_field_ids( $post_id, $field );
|
||||
}
|
||||
}
|
||||
|
||||
function thalim_sync_pods_taxonomy_relations( $post_id, $post ) {
|
||||
if ( ! ( $post instanceof WP_Post ) || 'post' !== $post->post_type ) {
|
||||
return;
|
||||
}
|
||||
if ( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) {
|
||||
if ( ! thalim_pod_tax_sync_applies( $post_id, $post ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
$snapshot = $GLOBALS['thalim_pod_tax_before'][ $post_id ] ?? [];
|
||||
unset( $GLOBALS['thalim_pod_tax_before'][ $post_id ] );
|
||||
|
||||
foreach ( thalim_pod_tax_sync_fields() as $field => $taxonomy ) {
|
||||
if ( ! taxonomy_exists( $taxonomy ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Valeurs du champ Pods (source de vérité) : une ligne postmeta par term_id.
|
||||
$ids = array_values( array_unique( array_filter(
|
||||
array_map( 'intval', (array) get_post_meta( $post_id, $field ) )
|
||||
) ) );
|
||||
if ( empty( $ids ) ) {
|
||||
$after = thalim_pod_tax_field_ids( $post_id, $field );
|
||||
// Sans état antérieur connu, on ne déduit aucun retrait.
|
||||
$before = $snapshot[ $field ] ?? $after;
|
||||
if ( empty( $before ) && empty( $after ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Termes déjà assignés en taxonomie native.
|
||||
$current = wp_get_object_terms( $post_id, $taxonomy, [ 'fields' => 'ids' ] );
|
||||
$current = is_wp_error( $current ) ? [] : array_map( 'intval', $current );
|
||||
$native = wp_get_object_terms( $post_id, $taxonomy, [ 'fields' => 'ids' ] );
|
||||
if ( is_wp_error( $native ) ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// N'ajouter que les manquants (append), ne jamais retirer.
|
||||
$missing = array_diff( $ids, $current );
|
||||
if ( ! empty( $missing ) ) {
|
||||
wp_set_object_terms( $post_id, array_values( $missing ), $taxonomy, true );
|
||||
$diff = thalim_pod_tax_sync_diff( $before, $after, array_map( 'intval', $native ) );
|
||||
if ( ! empty( $diff['add'] ) ) {
|
||||
wp_set_object_terms( $post_id, $diff['add'], $taxonomy, true );
|
||||
}
|
||||
if ( ! empty( $diff['remove'] ) ) {
|
||||
wp_remove_object_terms( $post_id, $diff['remove'], $taxonomy );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -189,7 +189,6 @@ function thalim_get_single_data($post_id) {
|
||||
$data['images'][] = [
|
||||
'url' => $src,
|
||||
'alt' => get_post_meta($doc_id, '_wp_attachment_image_alt', true) ?: '',
|
||||
'caption' => thalim_bilingual(wp_get_attachment_caption($doc_id) ?: '', $lang),
|
||||
'title' => thalim_bilingual(get_the_title($doc_id) ?: '', $lang),
|
||||
'portrait' => thalim_image_is_portrait($doc_id, $w, $h),
|
||||
];
|
||||
@@ -351,7 +350,6 @@ function thalim_get_single_data($post_id) {
|
||||
$seance_data['images'][] = [
|
||||
'url' => $src,
|
||||
'alt' => get_post_meta($doc_id, '_wp_attachment_image_alt', true) ?: '',
|
||||
'caption' => thalim_bilingual(wp_get_attachment_caption($doc_id) ?: '', $lang),
|
||||
'title' => thalim_bilingual(get_the_title($doc_id) ?: '', $lang),
|
||||
];
|
||||
}
|
||||
|
||||
+46
-12
@@ -4,7 +4,8 @@ $context = Timber::context();
|
||||
// Les séances de séminaire sont incluses : post-card-helpers réécrit leur
|
||||
// lien vers le séminaire parent + ancre #seance-{ID}.
|
||||
$excluded_cat_ids = thalim_archive_excluded_cat_ids( false ); // Non classé (+ Vie du labo non connectés)
|
||||
$search_query = get_search_query();
|
||||
$search_query = get_search_query(); // échappé : affichage uniquement (autoescape Twig désactivé)
|
||||
$search_raw = get_search_query( false ); // texte tapé : requêtes et URLs
|
||||
|
||||
// Read filter query params
|
||||
$f = thalim_archive_read_filters();
|
||||
@@ -30,11 +31,11 @@ $context['active_rubrique'] = $active_rubrique_id;
|
||||
$search_base = thalim_en_url( home_url('/') );
|
||||
|
||||
// Override annonces_url: rubrique reset stays on search page (no filter_cat)
|
||||
$context['annonces_url'] = add_query_arg(['s' => $search_query], $search_base);
|
||||
$context['annonces_url'] = add_query_arg(['s' => urlencode($search_raw)], $search_base);
|
||||
|
||||
// Base params preserved across filter links (preserves search term)
|
||||
$base_filter_params = array_filter([
|
||||
's' => $search_query,
|
||||
's' => urlencode($search_raw),
|
||||
'axe' => $active_axe ?: null,
|
||||
'date_from' => $active_date_from ?: null,
|
||||
'date_to' => $active_date_to ?: null,
|
||||
@@ -61,7 +62,7 @@ if ($active_cat_id) {
|
||||
|
||||
$query_args = [
|
||||
'post_type' => 'post',
|
||||
's' => $search_query,
|
||||
's' => $search_raw,
|
||||
'relevanssi' => true,
|
||||
'posts_per_page' => 12,
|
||||
'orderby' => 'relevance',
|
||||
@@ -116,7 +117,6 @@ $author_cards = [];
|
||||
if ( $search_query ) {
|
||||
$excluded_role_ids = thalim_excluded_role_ids(); // « À ranger », « Archive » (résolus par slug)
|
||||
$user_query_args = [
|
||||
'search' => '*' . $search_query . '*',
|
||||
'search_columns' => ['display_name'],
|
||||
'number' => 6,
|
||||
'orderby' => 'display_name',
|
||||
@@ -131,7 +131,13 @@ if ( $search_query ) {
|
||||
],
|
||||
];
|
||||
}
|
||||
$user_query = new WP_User_Query( $user_query_args );
|
||||
$found_users = [];
|
||||
foreach ( thalim_search_text_variants( $search_raw ) as $variant ) {
|
||||
$user_query_args['search'] = '*' . $variant . '*';
|
||||
foreach ( ( new WP_User_Query( $user_query_args ) )->get_results() as $found_user ) {
|
||||
$found_users[ $found_user->ID ] = $found_user;
|
||||
}
|
||||
}
|
||||
$lang = thalim_current_language();
|
||||
|
||||
// Direction IDs (same source as membres page and author page)
|
||||
@@ -139,7 +145,7 @@ if ( $search_query ) {
|
||||
$labo_directeur_id = $labo_page ? intval( get_post_meta( $labo_page->ID, 'directeur', true ) ) : 0;
|
||||
$labo_adjoint_id = $labo_page ? intval( get_post_meta( $labo_page->ID, 'directeur_adjoint', true ) ) : 0;
|
||||
|
||||
foreach ( $user_query->get_results() as $user ) {
|
||||
foreach ( array_slice( $found_users, 0, 6 ) as $user ) {
|
||||
$avatar_url = thalim_get_user_avatar_url( $user->ID );
|
||||
|
||||
$role_id = get_user_meta( $user->ID, 'role_1', true );
|
||||
@@ -182,23 +188,51 @@ $context['author_cards'] = $author_cards;
|
||||
// Search taxonomy terms (axes thématiques + programmes de recherche)
|
||||
$taxonomy_cards = [];
|
||||
if ( $search_query ) {
|
||||
$matching_terms = get_terms([
|
||||
$matching_terms = [];
|
||||
foreach ( thalim_search_text_variants( $search_raw ) as $variant ) {
|
||||
$found_terms = get_terms([
|
||||
'taxonomy' => [ 'axe_thematique', 'programme_de_recherche' ],
|
||||
'hide_empty' => false,
|
||||
'name__like' => $search_query,
|
||||
'name__like' => $variant,
|
||||
]);
|
||||
if ( ! is_wp_error( $matching_terms ) ) {
|
||||
if ( ! is_wp_error( $found_terms ) ) {
|
||||
foreach ( $found_terms as $found_term ) {
|
||||
$matching_terms[ $found_term->term_id ] = $found_term;
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach ( $matching_terms as $term ) {
|
||||
$tax_obj = get_taxonomy( $term->taxonomy );
|
||||
// Comptage réel, mêmes critères que taxonomy.php : $term->count n'est pas
|
||||
// fiable sur ces taxonomies Pods, sans object_type (WordPress le remet à 0).
|
||||
$count_query = new WP_Query([
|
||||
'post_type' => 'post',
|
||||
'post_status' => 'publish',
|
||||
'fields' => 'ids',
|
||||
'posts_per_page' => 1,
|
||||
'tax_query' => [
|
||||
'relation' => 'AND',
|
||||
[
|
||||
'taxonomy' => $term->taxonomy,
|
||||
'field' => 'term_id',
|
||||
'terms' => [ $term->term_id ],
|
||||
],
|
||||
[
|
||||
'taxonomy' => 'category',
|
||||
'field' => 'term_id',
|
||||
'terms' => [ thalim_cat_id('seance') ],
|
||||
'operator' => 'NOT IN',
|
||||
],
|
||||
],
|
||||
]);
|
||||
$taxonomy_cards[] = [
|
||||
'name' => $term->name,
|
||||
'url' => get_term_link( $term ),
|
||||
'taxonomy_label' => $tax_obj ? $tax_obj->labels->singular_name : $term->taxonomy,
|
||||
'count' => $term->count,
|
||||
'count' => $count_query->found_posts,
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
$context['taxonomy_cards'] = $taxonomy_cards;
|
||||
|
||||
Timber::render('search.twig', $context);
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
{% for term in taxonomy_cards %}
|
||||
<li class="taxonomy-results__item">
|
||||
<a href="{{ term.url }}" class="taxonomy-results__link">
|
||||
<span class="taxonomy-results__name">{{ term.name }}</span>
|
||||
<span class="taxonomy-results__name">{{ term.name | bilingual(current_language) }}</span>
|
||||
<span class="taxonomy-results__meta">{{ term.taxonomy_label }}{% if term.count %} · {{ term.count }} {{ term.count > 1 ? (current_language == 'en' ? 'posts' : 'publications') : (current_language == 'en' ? 'post' : 'publication') }}{% endif %}</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
<div class="swiper-slide">
|
||||
<figure>
|
||||
<img src="{{ img.url }}" alt="{{ img.alt }}" loading="lazy">
|
||||
{% set legend = article.show_image_titles and img.title ? img.title : img.caption %}
|
||||
{% set legend = article.show_image_titles ? img.title : '' %}
|
||||
{% if legend %}
|
||||
<figcaption>{{ legend }}</figcaption>
|
||||
{% endif %}
|
||||
@@ -67,7 +67,7 @@
|
||||
{% for img in landscape_images %}
|
||||
<figure>
|
||||
<img src="{{ img.url }}" alt="{{ img.alt }}" loading="lazy">
|
||||
{% set legend = article.show_image_titles and img.title ? img.title : img.caption %}
|
||||
{% set legend = article.show_image_titles ? img.title : '' %}
|
||||
{% if legend %}
|
||||
<figcaption>{{ legend }}</figcaption>
|
||||
{% endif %}
|
||||
@@ -93,7 +93,7 @@
|
||||
<div class="swiper-slide">
|
||||
<figure class="sidebar-portrait">
|
||||
<img src="{{ img.url }}" alt="{{ img.alt }}" loading="lazy">
|
||||
{% set legend = article.show_image_titles and img.title ? img.title : img.caption %}
|
||||
{% set legend = article.show_image_titles ? img.title : '' %}
|
||||
{% if legend %}
|
||||
<figcaption>{{ legend }}</figcaption>
|
||||
{% endif %}
|
||||
@@ -107,7 +107,7 @@
|
||||
{% else %}
|
||||
<figure class="sidebar-portrait">
|
||||
<img src="{{ portrait_images[0].url }}" alt="{{ portrait_images[0].alt }}" loading="lazy">
|
||||
{% set legend = article.show_image_titles and portrait_images[0].title ? portrait_images[0].title : portrait_images[0].caption %}
|
||||
{% set legend = article.show_image_titles ? portrait_images[0].title : '' %}
|
||||
{% if legend %}
|
||||
<figcaption>{{ legend }}</figcaption>
|
||||
{% endif %}
|
||||
@@ -353,7 +353,7 @@
|
||||
{% for img in s.images %}
|
||||
<figure>
|
||||
<img src="{{ img.url }}" alt="{{ img.alt }}" loading="lazy">
|
||||
{% set legend = s.show_image_titles and img.title ? img.title : img.caption %}
|
||||
{% set legend = s.show_image_titles ? img.title : '' %}
|
||||
{% if legend %}
|
||||
<figcaption>{{ legend }}</figcaption>
|
||||
{% endif %}
|
||||
@@ -444,7 +444,7 @@
|
||||
{% for img in s.images %}
|
||||
<figure>
|
||||
<img src="{{ img.url }}" alt="{{ img.alt }}" loading="lazy">
|
||||
{% set legend = s.show_image_titles and img.title ? img.title : img.caption %}
|
||||
{% set legend = s.show_image_titles ? img.title : '' %}
|
||||
{% if legend %}
|
||||
<figcaption>{{ legend }}</figcaption>
|
||||
{% endif %}
|
||||
|
||||
@@ -79,6 +79,22 @@ check('rôles exclus', thalim_excluded_role_ids(), [600, 598]);
|
||||
echo "== thalim_get_active_pinned_ids ==\n";
|
||||
check('catégorie 0 → []', thalim_get_active_pinned_ids(0), []);
|
||||
|
||||
echo "== thalim_pod_tax_sync_diff ==\n";
|
||||
check('coché : ajout', thalim_pod_tax_sync_diff([], [5], []), ['add' => [5], 'remove' => []]);
|
||||
check('tout décoché : retrait', thalim_pod_tax_sync_diff([5], [], [5]), ['add' => [], 'remove' => [5]]);
|
||||
check('décoché partiel', thalim_pod_tax_sync_diff([5, 6], [5], [5, 6]), ['add' => [], 'remove' => [6]]);
|
||||
check('natif hors champ conservé', thalim_pod_tax_sync_diff([5], [5], [5, 9]), ['add' => [], 'remove' => []]);
|
||||
check('orphelin sans coche conservé', thalim_pod_tax_sync_diff([], [], [9]), ['add' => [], 'remove' => []]);
|
||||
check('décoché déjà absent du natif', thalim_pod_tax_sync_diff([5], [], []), ['add' => [], 'remove' => []]);
|
||||
|
||||
echo "== thalim_search_text_variants ==\n";
|
||||
check('texte simple', thalim_search_text_variants('Oulipo'), ['Oulipo']);
|
||||
check('apostrophe droite', thalim_search_text_variants("l'Oulipo"), ["l'Oulipo", 'l’Oulipo']);
|
||||
check('apostrophe courbe', thalim_search_text_variants('l’Oulipo'), ["l'Oulipo", 'l’Oulipo']);
|
||||
check('esperluette', thalim_search_text_variants('a & b'), ['a & b', 'a & b']);
|
||||
check('guillemets inchangés', thalim_search_text_variants('"punk"'), ['"punk"']);
|
||||
check('les deux', thalim_search_text_variants("l'a & b"), ["l'a & b", 'l’a & b', "l'a & b", 'l’a & b']);
|
||||
|
||||
echo "== thalim_get_seance_parent_id ==\n";
|
||||
global $wpdb;
|
||||
$seance_id = (int) $wpdb->get_var(
|
||||
|
||||
Reference in New Issue
Block a user