Skip to content

Commit bcbe9ac

Browse files
committed
Merge branch 'develop'
2 parents d6b1067 + 3a128e4 commit bcbe9ac

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
## [1.6.1] - 2023-08-17
12+
13+
### Changed
14+
15+
* [PR-69](https://github.com/itk-dev/kunstdatabasen/pull/69)
16+
Fixed image carousels.
17+
Changed default ordering to by createdAt descending.
18+
1119
## [1.6.0] - 2023-08-10
1220

1321
### Changed

src/Repository/ArtworkRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct(ManagerRegistry $registry)
5858
*
5959
* @return \Doctrine\ORM\Query
6060
*/
61-
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
61+
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
6262
{
6363
$qb = $this->createQueryBuilder('e');
6464

templates/admin/item/details.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="container">
22
<div class="row art-details">
33
<div class="col-md-4">
4-
<div id="carouselImageIndicators" class="carousel slide" data-ride="carousel" data-interval="false">
4+
<div id="carouselImageIndicators" class="carousel slide" data-bs-ride="false" data-bs-interval="false">
55
<div class="carousel-inner">
66
{% for image in item.images %}
77
<div class="carousel-item{% if loop.first %} active{% endif %} position-relative">
@@ -20,11 +20,11 @@
2020
</div>
2121
{% if item.images|length > 1 %}
2222
<div class="d-flex justify-content-between mt-1">
23-
<a href="#carouselImageIndicators" role="button" data-slide="prev" style="color: black">
23+
<a href="#carouselImageIndicators" role="button" data-bs-slide="prev" style="color: black">
2424
<span class="sr-only">{{ 'image-carousel.previous'|trans }}</span> <i class="fas fa-arrow-alt-circle-left" aria-hidden="true"></i>
2525
</a>
2626
<span><span id="carouselImageActiveIndex">1</span> / {{ item.images|length }}</span>
27-
<a href="#carouselImageIndicators" role="button" data-slide="next" style="color: black">
27+
<a href="#carouselImageIndicators" role="button" data-bs-slide="next" style="color: black">
2828
<span class="sr-only">{{ 'image-carousel.next'|trans }}</span> <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i>
2929
</a>
3030
</div>

templates/app/_art.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<h1 id="detailsTitle">{{ data.artwork.title }}</h1>
1111
</div>
1212
<div class="col-md-3">
13-
<div id="carouselImageIndicators" class="carousel slide" data-ride="carousel" data-interval="false">
13+
<div id="carouselImageIndicators" class="carousel slide" data-bs-ride="false" data-bs-interval="false">
1414
<div class="carousel-inner">
1515
{% for image in data.artwork.images %}
1616
<div class="carousel-item{% if loop.first %} active{% endif %}" class="position-relative">
@@ -29,11 +29,11 @@
2929
</div>
3030
{% if data.artwork.images|length > 1 %}
3131
<div class="d-flex justify-content-between mt-1">
32-
<a href="#carouselImageIndicators" role="button" data-slide="prev" class="text-dark ms-5">
32+
<a href="#carouselImageIndicators" role="button" data-bs-slide="prev" class="text-dark ms-5">
3333
<span class="sr-only">{{ 'image-carousel.previous'|trans }}</span> <i class="fas fa-arrow-alt-circle-left" aria-hidden="true"></i>
3434
</a>
3535
<span><span id="carouselImageActiveIndex">1</span> / {{ data.artwork.images|length }}</span>
36-
<a href="#carouselImageIndicators" role="button" data-slide="next" class="text-dark me-5">
36+
<a href="#carouselImageIndicators" role="button" data-bs-slide="next" class="text-dark me-5">
3737
<span class="sr-only">{{ 'image-carousel.next'|trans }}</span> <i class="fas fa-arrow-alt-circle-right" aria-hidden="true"></i>
3838
</a>
3939
</div>

0 commit comments

Comments
 (0)