Merge branch 'TMS-1075' into stage

devgeniem · Oct 10, 2024 · d2212d5 · d2212d5
2 parents 69ce236 + d3ded34
commit d2212d5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 - TMS-1062: Increase menu-dropdown button size
+- TMS-1075: Redipress 2 filters
+
+## [1.10.3] - 2024-09-25
+
+- TMS-1071: Fix events price element class
+
+## [1.10.2] - 2024-09-25
+
 - TMS-1067: Show price-info for event in listing if it's free
 
 ## [1.10.1] - 2024-08-21

diff --git a/lib/PostType/Artwork.php b/lib/PostType/Artwork.php
@@ -62,17 +62,17 @@ public function __construct() {
      * @return void
      */
     public function hooks() : void {
-        add_action( 'init', Closure::fromCallable( [ $this, 'register' ] ), 15 );
-        add_filter( 'tms/gutenberg/blocks', Closure::fromCallable( [ $this, 'allowed_blocks' ] ), 10, 1 );
+        \add_action( 'init', Closure::fromCallable( [ $this, 'register' ] ), 15 );
+        \add_filter( 'tms/gutenberg/blocks', Closure::fromCallable( [ $this, 'allowed_blocks' ] ), 10, 1 );
 
-        add_filter(
+        \add_filter(
             'tms/base/breadcrumbs/before_prepare',
             Closure::fromCallable( [ $this, 'format_single_breadcrumbs' ] ),
             10,
             3
         );
 
-        add_filter( 'redipress/schema_fields', function ( $fields ) {
+        \add_filter( 'redipress/index/posts/schema_fields', function ( $fields ) {
             $fields[] = new TextField( [
                 'name'     => 'artists',
                 'sortable' => true,
@@ -81,15 +81,15 @@ public function hooks() : void {
             return $fields;
         }, PHP_INT_MAX, 1 );
 
-        add_filter( 'redipress/additional_field/artists', function ( $value, $post_id, $post ) {
+        \add_filter( 'redipress/additional_field/artists', function ( $value, $post_id, $post ) {
             if ( $post->post_type === Artwork::SLUG ) {
-                $value = get_post_meta( $post_id, 'artists', true );
+                $value = \get_post_meta( $post_id, 'artists', true );
             }
 
             return $value;
         }, 10, 3 );
 
-        add_filter( 'redipress/search_fields', function ( $fields ) {
+        \add_filter( 'redipress/search_fields', function ( $fields ) {
             $fields[] = 'artists';
 
             return $fields;

diff --git a/partials/views/page-events-calendar/page-events-calendar-item-grid.dust b/partials/views/page-events-calendar/page-events-calendar-item-grid.dust
@@ -53,7 +53,7 @@
 
         {#price}
             {?is_free}
-                <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
+                <div class="events__meta is-flex is-family-secondary is-align-items-center">
                     <span class="is-flex" aria-label="{Strings.s.event.price|attr}">
                         {>"ui/icon" icon="euro" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
                     </span>

diff --git a/style.css b/style.css
@@ -1,7 +1,7 @@
 /*
  * Theme Name:  TMS Theme Taidemuseo
  * Description: Tampere Multisite Taidemuseo Theme
- * Version:     1.10.1
+ * Version:     1.10.3
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Template:    tms-theme-base