Merge branch 'develop'

Author: tuj

CHANGELOG.md

@@ -8,6 +8,14 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.6.1] - 2023-08-17
+
+### Changed
+
+* [PR-69](https://github.com/itk-dev/kunstdatabasen/pull/69)
+  Fixed image carousels.
+  Changed default ordering to by createdAt descending.
+
 ## [1.6.0] - 2023-08-10
 
 ### Changed

src/Repository/ArtworkRepository.php

@@ -58,7 +58,7 @@ public function __construct(ManagerRegistry $registry)
      *
      * @return \Doctrine\ORM\Query
      */
-    public function getQuery(string $search = null, string $type = null, string $status = null, string $category = null, string $building = null, int $yearFrom = null, int $yearTo = null, int $minWidth = null, int $maxWidth = null, int $minHeight = null, int $maxHeight = null, string $artistGender = null, int $priceFrom = null, int $priceTo = null, array $orderBy = [['purchaseDate', Criteria::DESC]]): Query
+    public function getQuery(string $search = null, string $type = null, string $status = null, string $category = null, string $building = null, int $yearFrom = null, int $yearTo = null, int $minWidth = null, int $maxWidth = null, int $minHeight = null, int $maxHeight = null, string $artistGender = null, int $priceFrom = null, int $priceTo = null, array $orderBy = [['createdAt', Criteria::DESC]]): Query
     {
         $qb = $this->createQueryBuilder('e');
 

templates/admin/item/details.html.twig

@@ -1,7 +1,7 @@
 <div class="container">
     <div class="row art-details">
         <div class="col-md-4">
-            <div id="carouselImageIndicators" class="carousel slide" data-ride="carousel" data-interval="false">
+            <div id="carouselImageIndicators" class="carousel slide" data-bs-ride="false" data-bs-interval="false">
                 <div class="carousel-inner">
                     {% for image in item.images %}
                         <div class="carousel-item{% if loop.first %} active{% endif %} position-relative">
@@ -20,11 +20,11 @@
             </div>
             {% if item.images|length > 1 %}
             <div class="d-flex justify-content-between mt-1">
-                <a href="#carouselImageIndicators" role="button" data-slide="prev" style="color: black">
+                <a href="#carouselImageIndicators" role="button" data-bs-slide="prev" style="color: black">
                     <span class="sr-only">{{ 'image-carousel.previous'|trans }}</span> <i class="fas fa-arrow-alt-circle-left" aria-hidden="true"></i>
                 </a>
                 <span><span id="carouselImageActiveIndex">1</span> / {{ item.images|length }}</span>
-                <a href="#carouselImageIndicators" role="button" data-slide="next" style="color: black">
+                <a href="#carouselImageIndicators" role="button" data-bs-slide="next" style="color: black">
                     <span class="sr-only">{{ 'image-carousel.next'|trans }}</span> <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i>
                 </a>
             </div>

templates/app/_art.html.twig

@@ -10,7 +10,7 @@
             <h1 id="detailsTitle">{{ data.artwork.title }}</h1>
         </div>
         <div class="col-md-3">
-            <div id="carouselImageIndicators" class="carousel slide" data-ride="carousel" data-interval="false">
+            <div id="carouselImageIndicators" class="carousel slide" data-bs-ride="false" data-bs-interval="false">
                 <div class="carousel-inner">
                     {% for image in data.artwork.images %}
                         <div class="carousel-item{% if loop.first %} active{% endif %}" class="position-relative">
@@ -29,11 +29,11 @@
             </div>
             {% if data.artwork.images|length > 1 %}
             <div class="d-flex justify-content-between mt-1">
-                <a href="#carouselImageIndicators" role="button" data-slide="prev" class="text-dark ms-5">
+                <a href="#carouselImageIndicators" role="button" data-bs-slide="prev" class="text-dark ms-5">
                     <span class="sr-only">{{ 'image-carousel.previous'|trans }}</span> <i class="fas fa-arrow-alt-circle-left" aria-hidden="true"></i>
                 </a>
                 <span><span id="carouselImageActiveIndex">1</span> / {{ data.artwork.images|length }}</span>
-                <a href="#carouselImageIndicators" role="button" data-slide="next" class="text-dark me-5">
+                <a href="#carouselImageIndicators" role="button" data-bs-slide="next" class="text-dark me-5">
                     <span class="sr-only">{{ 'image-carousel.next'|trans }}</span> <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i>
                 </a>
             </div>