Merge pull request #26371 from nextcloud/backport/26370/stable21

nickvergessen · web-flow · commit b2072cd6fca3 · 2021-03-30T13:09:34.000+02:00
[stable21] Remove notifications when retesting profile field input
diff --git a/apps/settings/js/usersettings.js b/apps/settings/js/usersettings.js
@@ -10,6 +10,8 @@
 (function() {
 	'use strict';
 
+	var errorNotification;
+
 	/**
 	 * Model for storing and saving user settings
 	 *
@@ -25,8 +27,12 @@
 				return null;
 			}
 
+			if (errorNotification) {
+				errorNotification.hide();
+			}
+
 			if (data.status && data.status === 'error') {
-				OC.Notification.show(data.data.message, { type: 'error' });
+				errorNotification = OC.Notification.show(data.data.message, { type: 'error' });
 			}
 
 			if (_.isUndefined(data.data)) {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`(function() {`
`11`	`11`	`'use strict';`
`12`	`12`
	`13`	`+ var errorNotification;`
	`14`	`+`
`13`	`15`	`/**`
`14`	`16`	`* Model for storing and saving user settings`
`15`	`17`	`*`
`@@ -25,8 +27,12 @@`
`25`	`27`	`return null;`
`26`	`28`	`}`
`27`	`29`
	`30`	`+ if (errorNotification) {`
	`31`	`+ errorNotification.hide();`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`if (data.status && data.status === 'error') {`
`29`		`- OC.Notification.show(data.data.message, { type: 'error' });`
	`35`	`+ errorNotification = OC.Notification.show(data.data.message, { type: 'error' });`
`30`	`36`	`}`
`31`	`37`
`32`	`38`	`if (_.isUndefined(data.data)) {`