Skip to content

Commit

Permalink
[FEATURE] Don't show empty braces in link list in dashboard if a news…
Browse files Browse the repository at this point in the history
…letter is deleted

Instead show a message that this link was used in a deleted newsletter.
  • Loading branch information
einpraegsam committed Dec 6, 2024
1 parent 901b744 commit 76b6655
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 16 deletions.
4 changes: 4 additions & 0 deletions Resources/Private/Language/de.locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,10 @@
<source>Are you sure to delete this record?</source>
<target state="translated">Wollen Sie diesen Datensatz wirklich löschen?</target>
</trans-unit>
<trans-unit id="deletenewsletter">
<source>Deleted newsletter</source>
<target state="translated">Gelöschter Newsletter</target>
</trans-unit>
<trans-unit id="defaultLanguage">
<source>Default</source>
<target state="translated">Standard</target>
Expand Down
3 changes: 3 additions & 0 deletions Resources/Private/Language/locallang.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@
<trans-unit id="deleteconfirm">
<source>Are you sure to delete this record?</source>
</trans-unit>
<trans-unit id="deletenewsletter">
<source>Deleted newsletter</source>
</trans-unit>
<trans-unit id="defaultLanguage">
<source>Default</source>
</trans-unit>
Expand Down
40 changes: 24 additions & 16 deletions Resources/Private/Partials/Newsletter/Dashboard/Links.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
Links
</h3>
</div>
<div class="panel-body">
<ul class="list-group">
<f:for each="{groupedLinksByHref}" as="groupedLink">
<li class="list-group-item">
<span class="badge" style="float: right;" title="Overall">{groupedLink.count}</span>
<f:link.external uri="{groupedLink.target}">{groupedLink.target}</f:link.external>
<br>({groupedLink.newsletter.title})
</li>
</f:for>
</ul>
</div>
<div class="panel-heading">
<h3 class="panel-title">
Links
</h3>
</div>
<div class="panel-body">
<ul class="list-group">
<f:for each="{groupedLinksByHref}" as="groupedLink">
<li class="list-group-item">
<span class="badge" style="float: right;" title="Overall">{groupedLink.count}</span>
<f:link.external uri="{groupedLink.target}">{groupedLink.target}</f:link.external>
<br>
<f:if condition="{groupedLink.newsletter}">
<f:then>
{groupedLink.newsletter.title}
</f:then>
<f:else>
(<f:translate key="LLL:EXT:luxletter/Resources/Private/Language/locallang.xlf:deletednewsletter">Deleted Newsletter</f:translate>)
</f:else>
</f:if>
</li>
</f:for>
</ul>
</div>
</div>

0 comments on commit 76b6655

Please sign in to comment.