Merge branch 'master' into feature_relatedID

datacite · Mar 26, 2020 · 5043ba9 · 5043ba9
2 parents 7d87680 + 9a3b7c1
commit 5043ba9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/models/user.js b/app/models/user.js
@@ -6,7 +6,7 @@ export default Model.extend({
   meta: attr(),
 
   name: attr('string'),
-  givenNames: attr('string'),
+  givenName: attr('string'),
   familyName: attr('string'),
   createdAt: attr('date'),
   updatedAt: attr('date'),

diff --git a/app/templates/components/user-list.hbs b/app/templates/components/user-list.hbs
@@ -21,9 +21,9 @@
           <h5>ORCID</h5>
           <a href="{{user.orcid}}">{{user.orcid}}</a>
 
-          {{#if user.givenNames}}
+          {{#if user.givenName}}
             <h5>Given Name</h5>
-            {{user.givenNames}}
+            {{user.givenName}}
           {{/if}}
 
           {{#if user.familyName}}

diff --git a/app/templates/components/user-show.hbs b/app/templates/components/user-show.hbs
@@ -7,9 +7,9 @@
         <h5>ORCID ID</h5>
         <a href="{{model.orcid}}">{{model.orcid}}</a>
 
-        {{#if model.givenNames}}
+        {{#if model.givenName}}
           <h5>Given Name</h5>
-          {{model.givenNames}}
+          {{model.givenName}}
         {{/if}}
 
         {{#if model.familyName}}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bracco",
-  "version": "3.5.14",
+  "version": "3.6.0",
   "private": true,
   "description": "Fabrica",
   "repository": {