Skip to content

Commit 9fce33f

Browse files
tdonohuetdonohue
authored
Merge pull request #3805 from DSpace/backport-3719-to-dspace-7_x
[Port dspace-7_x] Remove nested span elements with duplicate content of parent elements
2 parents 96cdab8 + 04123f9 commit 9fce33f

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@
2222
class="lead item-list-title dont-break-out"
2323
[innerHTML]="dsoTitle"></span>
2424
<span class="text-muted">
25-
<ds-truncatable-part [id]="dso.id" [minLines]="1">
26-
<span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
27-
class="item-list-journal-issues">
28-
<span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
29-
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
30-
</span>
31-
<span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
32-
class="item-list-journal-issue-numbers">
33-
<span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
34-
<span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
35-
</span>
36-
</span>
25+
<ds-truncatable-part [id]="dso.id" [minLines]="1">
26+
<span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
27+
class="item-list-journal-issues">
28+
<span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
29+
<span [innerHTML]="value"></span><span *ngIf="!last">; </span>
3730
</span>
31+
<span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
32+
class="item-list-journal-issue-numbers">
33+
<span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
34+
<span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
35+
</span>
36+
</span>
37+
</span>
3838
</ds-truncatable-part>
39-
</span>
39+
</span>
4040
</ds-truncatable>
4141
</div>
4242
</div>

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<span *ngIf="dso.allMetadata(['journal.title']).length > 0"
2727
class="item-list-journal-volumes">
2828
<span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
29-
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
29+
<span [innerHTML]="value"></span><span *ngIf="!last">; </span>
3030
</span>
3131
</span>
3232
<span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
3333
class="item-list-journal-volume-identifiers">
3434
<span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
35-
<span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
35+
<span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
3636
</span>
3737
</span>
3838
</ds-truncatable-part>

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
2525
class="item-list-journals">
2626
<span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
27-
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
27+
<span [innerHTML]="value"></span><span *ngIf="!last">; </span>
2828
</span>
2929
</span>
3030
</ds-truncatable-part>

‎src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
3333
<!--class="item-list-status">-->
3434
<!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
35-
<!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
35+
<!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
3636
<!--</span>-->
3737
<!--</span>-->
3838
<!--</ds-truncatable-part>-->

‎src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
44
class="item-list-job-title">
55
<span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
6-
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
6+
<span [innerHTML]="value"></span><span *ngIf="!last">; </span>
77
</span>
88
</span>
99
</span>

‎src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<span class="text-muted">
1212
<span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
1313
class="item-list-address-locality">
14-
<span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
14+
<span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
1515
</span>
1616
<span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
1717
class="item-list-address-country">
18-
<span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
18+
<span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
1919
</span>
2020
</span>
2121
</div>

‎src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
(clickSuggestion)="select($event)"
2424
(submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
2525
<span class="text-muted">
26-
<span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
27-
class="item-list-job-title">
28-
<span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
29-
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
30-
</span>
26+
<span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
27+
class="item-list-job-title">
28+
<span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
29+
<span [innerHTML]="value"></span><span *ngIf="!last">; </span>
30+
</span>
31+
</span>
3132
</span>
32-
</span>
3333
</div>
3434
</div>
3535
</div>

0 commit comments

Comments
 (0)