Skip to content

Commit 0b6a855

Browse files
authored
Merge pull request #6880 from ORCID/AddUrlToProfessionalActivitiesSummary
Add url info to affiliations form
2 parents 5cbd6f6 + 8572a04 commit 0b6a855

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

orcid-core/src/main/java/org/orcid/pojo/ajaxForm/AffiliationForm.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,9 @@ public static AffiliationForm valueOf(AffiliationSummary summary) {
192192
form.setAffiliationExternalIdentifiers(affiliationExternalIdentifiers);
193193
}
194194

195-
// Set empty url field
196-
form.setUrl(new Text());
195+
if(summary.getUrl() != null && summary.getUrl().getValue() != null) {
196+
form.setUrl(Text.valueOf(summary.getUrl().getValue()));
197+
}
197198

198199
form.setCreatedDate(Date.valueOf(summary.getCreatedDate()));
199200
form.setLastModified(Date.valueOf(summary.getLastModifiedDate()));

orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,7 @@ RecordSummary getSummary(String orcid) {
383383
}
384384
}
385385
recordSummary.setName(displayName);
386-
}
387-
388-
ActivitiesSummary activitiesSummary = record.getActivitiesSummary();
386+
}
389387

390388
AffiliationGroupContainer groupedAffiliations = publicProfileController.getGroupedAffiliations(orcid);
391389
List<AffiliationGroupForm> groupedEmployments = groupedAffiliations.getAffiliationGroups().get(AffiliationType.EMPLOYMENT);

0 commit comments

Comments
 (0)