Merge pull request #25 from TAMULib/tamu_orcid

Added ability for admin to remove an orcid. If an orcid is set to null i...
TAMULib · Oct 6, 2014 · 1275746 · 1275746
2 parents 40f4803 + b2931dd
commit 1275746
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/app/controllers/ViewTab.java b/app/controllers/ViewTab.java
@@ -255,23 +255,27 @@ public static void updateJSON(Long subId, String field, String value){
 				//ORCID
 			} else if("orcid".equals(field)) {
 
-				value = Utilities.formatOrcidAsDashedId(value);
-
-				if(!Utilities.validateOrcidFormat(value))
-					throw new RuntimeException("The provided ORCiD is not in a valid format.");
-
-				// Verify the ORCID id by pinging their API
-				boolean orcidVerify = true;
-				if (settingRepo.getConfigBoolean(AppConfig.ORCID_VALIDATION)) {
-					if (settingRepo.getConfigBoolean(AppConfig.ORCID_AUTHENTICATION))
-						orcidVerify = Utilities.verifyOrcid(value, submission.getStudentFirstName(), submission.getStudentLastName());
-					else
-						orcidVerify = Utilities.verifyOrcid(value);
+				if (value == null || value.length()==0) {
+					submission.setOrcid(null);
+				} else {
+					value = Utilities.formatOrcidAsDashedId(value);
+
+					if(!Utilities.validateOrcidFormat(value))
+						throw new RuntimeException("The provided ORCiD is not in a valid format.");
+
+					// Verify the ORCID id by pinging their API
+					boolean orcidVerify = true;
+					if (settingRepo.getConfigBoolean(AppConfig.ORCID_VALIDATION)) {
+						if (settingRepo.getConfigBoolean(AppConfig.ORCID_AUTHENTICATION))
+							orcidVerify = Utilities.verifyOrcid(value, submission.getStudentFirstName(), submission.getStudentLastName());
+						else
+							orcidVerify = Utilities.verifyOrcid(value);
+					}
+					if (!orcidVerify)
+						throw new RuntimeException("The provided ORCiD could not be validated.");
+
+					submission.setOrcid(value);
 				}
-				if (!orcidVerify)
-					throw new RuntimeException("The provided ORCiD could not be validated.");
-
-				submission.setOrcid(value);
 				currentValue = submission.getOrcid();	
 
 				//Permanent Phone

diff --git a/app/controllers/submit/PersonalInfo.java b/app/controllers/submit/PersonalInfo.java
@@ -338,7 +338,8 @@ public static void personalInfo(Long subId) {
 			firstName = sub.getStudentFirstName();
 			middleName = sub.getStudentMiddleName();
 			lastName = sub.getStudentLastName();
-			orcid = sub.getOrcid();
+			if(sub.getOrcid() != null)
+				orcid = sub.getOrcid();
 			birthYear = sub.getStudentBirthYear() != null ? String.valueOf(sub.getStudentBirthYear()) : null;
 			program = sub.getProgram();
 			college = sub.getCollege();