Don't display the Slides header when slides are not published (#395)

This should have been done in 2017 in bb4eb85 already, but wasn't.
spaze · Sep 25, 2024 · c6b3ed2 · c6b3ed2
2 parents 5e89f30 + 9a8a86a
commit c6b3ed2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/site/app/Admin/Presenters/templates/Talks/default.latte b/site/app/Admin/Presenters/templates/Talks/default.latte
@@ -3,7 +3,7 @@
 	<a n:href="Talks:talk $item->getId()"><strong n:tag-if="$upcoming">{$item->getTitle()}</strong></a>
 	<small n:if="$item->getLocale() !== $defaultLocale">{icon flag} {_"messages.locales.{$item->getLocale()}"}</small>
 	<small><strong class="date">{$item->getDate()|localeDay}</strong>, {$item->getEvent()}</small>
-	<span n:if="$item->isHasSlides()" title="{_messages.label.slides}">{icon images}</span>
+	<span n:if="$item->hasSlides()" title="{_messages.label.slides}">{icon images}</span>
 	<span n:if="$item->getVideo()->getVideoHref()" title="{_messages.label.videorecording}">{icon camera-video}</span>
 	<small>(<a n:href="slides $item->getId()">upravit slajdy</a>)</small>
 </li>

diff --git a/site/app/Talks/Talk.php b/site/app/Talks/Talk.php
@@ -126,7 +126,7 @@ public function getHref(): ?string
 	}
 
 
-	public function isHasSlides(): bool
+	public function hasSlides(): bool
 	{
 		return $this->hasSlides;
 	}

diff --git a/site/app/Talks/Talks.php b/site/app/Talks/Talks.php
@@ -42,7 +42,7 @@ public function getAll(?int $limit = null): array
 				t.date,
 				t.duration,
 				t.href,
-				t.slides_href IS NOT NULL OR EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk)) AS hasSlides,
+				t.slides_href IS NOT NULL OR (t.publish_slides AND EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk))) AS hasSlides,
 				t.slides_href AS slidesHref,
 				t.slides_embed AS slidesEmbed,
 				t.slides_note AS slidesNote,
@@ -103,7 +103,7 @@ public function getUpcoming(): array
 				t.date,
 				t.duration,
 				t.href,
-				t.slides_href IS NOT NULL OR EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk)) AS hasSlides,
+				t.slides_href IS NOT NULL OR (t.publish_slides AND EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk))) AS hasSlides,
 				t.slides_href AS slidesHref,
 				t.slides_embed AS slidesEmbed,
 				t.slides_note AS slidesNote,
@@ -154,7 +154,7 @@ public function get(string $name): Talk
 				t.date,
 				t.duration,
 				t.href,
-				t.slides_href IS NOT NULL OR EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk)) AS hasSlides,
+				t.slides_href IS NOT NULL OR (t.publish_slides AND EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk))) AS hasSlides,
 				t.slides_href AS slidesHref,
 				t.slides_embed AS slidesEmbed,
 				t.slides_note AS slidesNote,
@@ -205,7 +205,7 @@ public function getById(int $id): Talk
 				t.date,
 				t.duration,
 				t.href,
-				t.slides_href IS NOT NULL OR EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk)) AS hasSlides,
+				t.slides_href IS NOT NULL OR (t.publish_slides AND EXISTS (SELECT * FROM talk_slides s WHERE s.key_talk = COALESCE(t.key_talk_slides, t.id_talk))) AS hasSlides,
 				t.slides_href AS slidesHref,
 				t.slides_embed AS slidesEmbed,
 				t.slides_note AS slidesNote,

diff --git a/site/app/Talks/talksList.latte b/site/app/Talks/talksList.latte
@@ -9,6 +9,6 @@
 	{/if}
 	<br>
 	<small><strong class="date">{$talk->getDate()|localeDay}</strong>, {$talk->getEvent()}{if $talk->getDuration()} ({_messages.talks.durationshort|format:$talk->getDuration()}){/if}</small>
-	<span n:if="$talk->isHasSlides()" title="{_messages.label.slides}">{icon images}</span>
+	<span n:if="$talk->hasSlides()" title="{_messages.label.slides}">{icon images}</span>
 	<span n:if="$talk->getVideo()->getVideoHref()" title="{_messages.label.videorecording}">{icon camera-video}</span>
 </p>
diff --git a/site/app/Www/Presenters/templates/Talks/talk.latte b/site/app/Www/Presenters/templates/Talks/talk.latte
@@ -1,3 +1,4 @@
+{varType MichalSpacekCz\Talks\Talk $talk}
 {var $containerExtraClass = 'talk'}
 {var $containerColsClass = 'with-sidebar'}
 {define #headerIcon}{/define}
@@ -34,7 +35,7 @@
 	<small n:if="$talk->getDuration() || $slides || $talk->getVideo()->getVideoHref()">({if $talk->getDuration()}{_messages.talks.duration|format:$talk->getDuration()}{if $slides || $talk->getVideo()->getVideoHref()}, {/if}{/if}{if $slides}<a href="#{_html.id.slides}">{_messages.talks.slidescount, count($slides)}</a>{if $talk->getVideo()->getVideoHref()}, {/if}{/if}{if $talk->getVideo()->getVideoHref()}<a href="#{_html.id.recording}">{_messages.label.lowercasevideo}</a>{/if})</small>
 </p>
 
-<h2 n:if="$talk->isHasSlides() || $talk->getSlidesNote()" id="{_html.id.slides}">{_messages.label.slides}</h2>
+<h2 n:if="$talk->hasSlides() || $talk->getSlidesNote()" id="{_html.id.slides}">{_messages.label.slides}</h2>
 {if $talk->getSlidesNote()}{$talk->getSlidesNote()}{/if}
 {if $talk->getSlidesHref()}
 	<p><span title="{_messages.label.slides}">{icon images}</span> <a href="{$talk->getSlidesHref()}">{$slidesPlatform ?? $talk->getSlidesHref()}</a></p>

diff --git a/site/psalm.xml b/site/psalm.xml
@@ -64,6 +64,7 @@
 				<referencedMethod name="/.*::createComponent.*/" /> <!-- Classes that extend Nette\Application\UI\Control -->
 				<referencedMethod name="/.*::get.*/" /> <!-- Getters used mostly in templates -->
 				<referencedMethod name="/.*::is.*/" /> <!-- Used mostly in templates -->
+				<referencedMethod name="/.*::has.*/" /> <!-- Used mostly in templates -->
 				<referencedMethod name="/.*::jsonSerialize$/" /> <!-- Used by Nette\Application\UI\Presenter::sendJson() or by Nette\Utils\Json::encode() -->
 				<referencedMethod name="/.*::render$/" /> <!-- Classes that extend Nette\Application\UI\Control -->
 				<referencedMethod name="/.*Presenter::handle.*/" />