Skip to content

Commit 92e4e9d

Browse files
authored
Merge pull request #750 from distributive/april-fools-2023
Late Night Hotfix
2 parents d6bbc72 + 3637639 commit 92e4e9d

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

app/Resources/views/Search/display-full.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<div class="col-sm-5" style="margin-bottom:2em">
5353
<div class="card-image">
5454
{% if card.imageUrl %}
55-
<img data-src="{{ card_image_url }}{{ asset(card.large_image_path) }}" alt="{{ card.title }}" class="img-responsive lazyload card-image" style="margin:auto">
55+
<img data-src="{{ card_image_url }}{{ asset(card.daeg_image_path) }}" alt="{{ card.title }}" class="img-responsive lazyload card-image" style="margin:auto">
5656
{% else %}
5757
<div class="no-image" style="margin:auto"><div class="no-image-text">No image</div></div>
5858
{% endif %}
@@ -66,4 +66,3 @@
6666
</div>
6767

6868
{% endblock %}
69-

app/Resources/views/Search/display-zoom.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div class="col-sm-4">
1313
<div class="card-image">
1414
{% if card.imageUrl %}
15-
<img data-src="{{ card_image_url }}{{ asset(card.large_image_path) }}" alt="{{ card.title }}" class="img-responsive lazyload card-image" style="margin:auto">
15+
<img data-src="{{ card_image_url }}{{ asset(card.daeg_image_path) }}" alt="{{ card.title }}" class="img-responsive lazyload card-image" style="margin:auto">
1616
{% else %}
1717
<div class="no-image" style="margin:auto"><div class="no-image-text">No image</div></div>
1818
{% endif %}

src/AppBundle/Entity/Card.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,29 +1035,37 @@ public function getDaegedImageCode()
10351035
*/
10361036
public function getTinyImagePath()
10371037
{
1038-
return '/tiny/' . $this->getDaegedImageCode() . '.jpg';
1038+
return '/tiny/' . $this->code . '.jpg';
10391039
}
10401040

10411041
/**
10421042
* @return string
10431043
*/
10441044
public function getSmallImagePath()
10451045
{
1046-
return '/small/' . $this->getDaegedImageCode() . '.jpg';
1046+
return '/small/' . $this->code . '.jpg';
10471047
}
10481048

10491049
/**
10501050
* @return string
10511051
*/
10521052
public function getMediumImagePath()
10531053
{
1054-
return '/medium/' . $this->getDaegedImageCode() . '.jpg';
1054+
return '/medium/' . $this->code . '.jpg';
10551055
}
10561056

10571057
/**
10581058
* @return string
10591059
*/
10601060
public function getLargeImagePath()
1061+
{
1062+
return '/large/' . $this->code . '.jpg';
1063+
}
1064+
1065+
/**
1066+
* @return string
1067+
*/
1068+
public function getDaegImagePath()
10611069
{
10621070
return '/large/' . $this->getDaegedImageCode() . '.jpg';
10631071
}

src/AppBundle/Service/CardsData.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,7 @@ public function getCardInfo(Card $card, string $locale)
864864
"small_image_path" => $card->getSmallImagePath(),
865865
"medium_image_path" => $card->getMediumImagePath(),
866866
"large_image_path" => $card->getLargeImagePath(),
867+
"daeg_image_path" => $card->getDaegImagePath(),
867868
];
868869

869870
// setting the card cost to X if the cost is null and the card is not of a costless type

0 commit comments

Comments
 (0)