handle remove affiliation #246

datacite · Nov 26, 2019 · a22f617 · a22f617
1 parent 2f48e4a
commit a22f617
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/app/components/doi-affiliation.js b/app/components/doi-affiliation.js
@@ -7,12 +7,21 @@ export default Component.extend({
   organizations: [],
 
   updateAffiliation(organizationRecord) {
-    this.fragment.set('name', organizationRecord.name);
-    this.fragment.set('affiliationIdentifier', organizationRecord.id);
-    this.fragment.set('schemeUri', 'https://ror.org');
-    this.fragment.set('affiliationIdentifierScheme', 'ROR');
-
-    this.setCreatorValidationClass();
+    if (organizationRecord) {
+      this.fragment.set('name', organizationRecord.name);
+      this.fragment.set('affiliationIdentifier', organizationRecord.id);
+      this.fragment.set('schemeUri', 'https://ror.org');
+      this.fragment.set('affiliationIdentifierScheme', 'ROR');
+
+      this.setCreatorValidationClass();
+    } else {
+      this.fragment.set('name', null);
+      this.fragment.set('affiliationIdentifier', null);
+      this.fragment.set('schemeUri', 'https://ror.org');
+      this.fragment.set('affiliationIdentifierScheme', 'ROR');
+
+      // this.setCreatorValidationClass();
+    }
   },
 
   actions: {
@@ -23,11 +32,7 @@ export default Component.extend({
       });
     },
     selectRor(ror) {
-      if (ror) {
-        this.updateAffiliation(ror);
-      } else {
-        this.updateAffiliation(null);
-      }
+      this.updateAffiliation(ror);
     },
     deleteAffiliation() {
       this.creator.get('affiliation').removeObject(this.fragment);