Issue #SB-0000 fix:sign in page should not show merge error messages (p…

…roject-sunbird#775)
tanmayranjan · Aug 28, 2019 · be900ea · be900ea
1 parent ce7e61f
commit be900ea
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/ansible/artifacts/sunbird/login/resources/js/login.js b/ansible/artifacts/sunbird/login/resources/js/login.js
@@ -8,15 +8,17 @@ window.onload = function(){
 	var renderingType = 'queryParams';
 	if (!mergeaccountprocess) {
 		mergeaccountprocess = localStorage.getItem('mergeaccountprocess');
-		if (!version) {
-			version = localStorage.getItem('version');
-		}
-		hideElement("mergeAccountMessage");
-		renderingType = 'local-storage';
-		var error_summary = document.getElementById('error-summary');
-		if (error_summary) {
-			var errorMessage = error_summary.innerHTML.valueOf();
-			error_summary.innerHTML = errorMessage + 'to merge';
+		if (mergeaccountprocess === '1') {
+			if (!version) {
+				version = localStorage.getItem('version');
+			}
+			hideElement("mergeAccountMessage");
+			renderingType = 'local-storage';
+			var error_summary = document.getElementById('error-summary');
+			if (error_summary) {
+				var errorMessage = error_summary.innerHTML.valueOf();
+				error_summary.innerHTML = errorMessage + 'to merge';
+			}
 		}
 	} else {
 		localStorage.clear()