Merge pull request DSpace#3805 from DSpace/backport-3719-to-dspace-7_x

[Port dspace-7_x] Remove nested span elements with duplicate content of parent elements
tdonohue · Jan 7, 2025 · 9fce33f · 9fce33f
2 parents 96cdab8 + 04123f9
commit 9fce33f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/...esult-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/...esult-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -22,21 +22,21 @@
             class="lead item-list-title dont-break-out"
             [innerHTML]="dsoTitle"></span>
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-                </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
+                class="item-list-journal-issues">
+            <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
+              <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
             </span>
+            <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
+                  class="item-list-journal-issue-numbers">
+              <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let first=first; let last=last;">
+                <span *ngIf="first"> - </span><span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+              </span>
+            </span>
+          </span>
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>
diff --git a/...ult-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/...ult-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -26,13 +26,13 @@
             <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
                     <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
             <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
                   class="item-list-journal-volume-identifiers">
                     <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
+                        <span> (</span><span [innerHTML]="value"></span><span>)</span><span *ngIf="!last">;</span>
                     </span>
             </span>
         </ds-truncatable-part>

diff --git a/...nts/search-result-list-elements/journal/journal-search-result-list-element.component.html b/...nts/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -24,7 +24,7 @@
             <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
                   class="item-list-journals">
                     <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                        <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
                     </span>
             </span>
         </ds-truncatable-part>

diff --git a/...nts/search-result-list-elements/project/project-search-result-list-element.component.html b/...nts/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -32,7 +32,7 @@
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
       <!--</span>-->
       <!--</span>-->
       <!--</ds-truncatable-part>-->

diff --git a/...entities/metadata-representations/person/person-item-metadata-list-element.component.html b/...entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -3,7 +3,7 @@
       <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
               <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                  <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
               </span>
       </span>
   </span>

diff --git a/...item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/...item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -11,11 +11,11 @@
         <span class="text-muted">
         <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
               class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
         </span>
         <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
               class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
         </span>
         </span>
     </div>

diff --git a/...ion/item-list-elements/person/person-search-result-list-submission-element.component.html b/...ion/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -23,13 +23,13 @@
                                      (clickSuggestion)="select($event)"
                                      (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-              class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
+          <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+                class="item-list-job-title">
+                  <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                      <span [innerHTML]="value"></span><span *ngIf="!last">; </span>
+                  </span>
+          </span>
         </span>
-    </span>
       </div>
     </div>
   </div>