Skip to content

Commit

Permalink
Merge pull request #89 from TAMULib/comment-fixes
Browse files Browse the repository at this point in the history
RDC Sprint 3 Staging Review Resolutions
  • Loading branch information
qtamu authored Aug 22, 2024
2 parents c602c61 + ebaca39 commit c2589d9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions src/app/core/breadcrumbs/dso-name.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export class DSONameService {
const types = dso.getRenderTypes();
const entityType = types
.filter((type) => typeof type === 'string')
// TAMU Customization - added 'Dataset' after 'Person'
.find((type: string) => (['Person', 'Dataset']).includes(type)) as string;
if (entityType === 'Person') {
const familyName = this.firstMetadataValue(object, dso, 'person.familyName');
Expand All @@ -106,10 +107,10 @@ export class DSONameService {
return familyName || givenName;
}
return `${familyName}, ${givenName}`;
// TAMU Customization - swithched the entitiy to look for DATASET in stead of orgUnit
// TAMU Customization - switched the entity type to look for DATASET instead of orgUnit
} else if (entityType === 'Dataset') {
// return this.firstMetadataValue(object, dso, 'organization.legalName') || this.translateService.instant('dso.name.untitled'); <- the core code
//Tamu Customization - Item list view to show Dimension tile and Project long Title. It will default to one or the other if only one exists.
// TAMU Customization - Item list view to show Dimension tile and Project long Title. It will default to one or the other if only one exists.
const datasetTitle = dso.firstMetadataValue('dc.title.dataset');
const projectTitle = dso.firstMetadataValue('dc.title.project');

Expand All @@ -122,6 +123,7 @@ export class DSONameService {
} else {
return this.translateService.instant('dso.name.untitled');
}
// END TAMU Customization - Item list view to show Dimension tile and Project long Title. It will default to one or the other if only one exists.
}
// TAMU Customization - only added two || conditions up to dc.title.dataset after the || is core code.(dso.name and || this.translateService.instant('dso.name.untitled') )
return this.firstMetadataValue(object, dso, 'dc.title.project') || dso.firstMetadataValue('dc.title.dataset') || dso.firstMetadataValue('dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</div>
<span class="dont-break-out">{{ dsoNameService.getName(item) }}</span>
</h1> -->
<!-- End of core code block -->
<!-- END of core code block -->

<!-- TAMU Customization -title display on Dataset entities for simple item view -->
<h1 class="item-page-title-field">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</ds-themed-item-page-title-field>
<ds-dso-edit-menu></ds-dso-edit-menu>
</div>

<div class="row">
<!-- TAMU Customization - icon thumbnail style `thumb-font-4` -->
<div class="col-xs-12 col-md-4 thumb-font-4">
Expand Down

0 comments on commit c2589d9

Please sign in to comment.