Safak/SWE
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/themennamen' into 'dev'

Browse Source 
Verwandte Themen als Displaynamen anzeigen

See merge request eb2342s/swe-b1-a!8
This commit was merged in pull request #68.
This commit is contained in:
Safak Hazinedar
2024-11-17 19:30:08 +01:00
parent 8429bdec0f b2119a2287
commit ea018d1fa8
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webseite/classes/SubjectData.php
View File

@@ -64,7 +64,7 @@ class SubjectData
continue; continue;
} }
$result[] = $subjectData; $result[$subjectData->id] = $subjectData;
} }
return $result; return $result;

2
webseite/classes/TopicData.php
View File

@@ -63,7 +63,7 @@ class TopicData
continue; continue;
} }
$result[] = $topicData; $result[$topicData->id] = $topicData;
} }
return $result; return $result;

9
webseite/subject.php
View File

@@ -621,10 +621,15 @@ $topics = $subjectData->topics;
<h4>Verwandte Themen:</h4> <h4>Verwandte Themen:</h4>
<ul> <ul>
<?php <?php
foreach ($topicData->relatedTopics as $relatedTopic) { foreach ($topicData->relatedTopics as $relatedTopicName) {
$relatedTopic = $subjectData->topics[$relatedTopicName];
if(!isset($relatedTopicName)) {
continue;
}
?> ?>
<li><?php echo($relatedTopic); ?></li> <li><?php echo($relatedTopic->displayName); ?></li>
<?php <?php
} }

11
webseite/topic.php
View File

@@ -373,11 +373,16 @@ if(!isset($topicData)) {
<h3>Verwandte Themen</h3> <h3>Verwandte Themen</h3>
<div style="display: flex; flex-wrap: wrap; gap: 0.5rem;"> <div style="display: flex; flex-wrap: wrap; gap: 0.5rem;">
<?php <?php
foreach ($topicData->relatedTopics as $relatedTopic) { foreach ($topicData->relatedTopics as $relatedTopicName) {
$relatedTopic = $subjectData->topics[$relatedTopicName];
if(!isset($relatedTopic)) {
continue;
}
?> ?>
<a href='<?php echo("topic.php?subject=$subjectData->id&topic=$relatedTopic") ?>'> <a href='<?php echo("topic.php?subject=$subjectData->id&topic=$relatedTopic->id") ?>'>
<span class="topic-tag"><?php echo($relatedTopic); ?></span> <span class="topic-tag"><?php echo($relatedTopic->displayName); ?></span>
</a> </a>
<?php <?php