Prevent 'null' from displaying in the 'Found similar people' table. (#…

…203)
openmrs · Oct 2, 2024 · 528e938 · 528e938
1 parent 155d73a
commit 528e938
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/OpenmrsSearch.js b/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/OpenmrsSearch.js
@@ -475,9 +475,7 @@ dojo.widget.defineWidget(
 
 
 	noCell: function() {
-		var td = document.createElement("td");
-		td.style.display = "none";
-		return td;
+		return document.createElement("td");
 	},
 
 	getNumber: function(searchHit) {

diff --git a/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/PersonSearch.js b/omod/src/main/webapp/resources/scripts/dojo/src/widget/openmrs/PersonSearch.js
@@ -67,9 +67,9 @@ dojo.widget.defineWidget(
 			}
 		},
 
-		getGiven : function(p) { return p.givenName == null ? this.noCell() : p.givenName;  },
-		getMiddle: function(p) { return p.middleName == null ? this.noCell() : p.middleName; },
-		getFamily: function(p) { return p.familyName == null ? this.noCell() : p.familyName; },
+		getGiven : function(p) { return p.givenName == null || p.givenName === "null" ? this.noCell() : p.givenName;  },
+		getMiddle: function(p) { return p.middleName == null || p.middleName === "null" ? this.noCell() : p.middleName; },
+		getFamily: function(p) { return p.familyName == null || p.familyName === "null" ? this.noCell() : p.familyName; },
 		getGender: function(p) {
 				if (p.gender == null) { return this.noCell(); }