Merge pull request #31458 from nextcloud/backport/31358/stable22

nextcloud · Mar 8, 2022 · a132ae1 · a132ae1
2 parents e26c56b + 7fc9536
commit a132ae1
Show file tree

Hide file tree

Showing 21 changed files with 106 additions and 105 deletions.
diff --git a/apps/settings/js/vue-settings-admin-security.js b/apps/settings/js/vue-settings-admin-security.js
diff --git a/apps/settings/js/vue-settings-admin-security.js.map b/apps/settings/js/vue-settings-admin-security.js.map
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/js/vue-settings-nextcloud-pdf.js b/apps/settings/js/vue-settings-nextcloud-pdf.js
diff --git a/apps/settings/js/vue-settings-nextcloud-pdf.js.map b/apps/settings/js/vue-settings-nextcloud-pdf.js.map
diff --git a/apps/settings/js/vue-settings-personal-info.js b/apps/settings/js/vue-settings-personal-info.js
diff --git a/apps/settings/js/vue-settings-personal-info.js.map b/apps/settings/js/vue-settings-personal-info.js.map
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js b/apps/settings/js/vue-settings-personal-webauthn.js
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js.map b/apps/settings/js/vue-settings-personal-webauthn.js.map
diff --git a/apps/settings/js/vue-settings-users.js b/apps/settings/js/vue-settings-users.js
diff --git a/apps/settings/js/vue-settings-users.js.map b/apps/settings/js/vue-settings-users.js.map
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users.js b/apps/settings/js/vue-vendors-settings-apps-settings-users.js
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users.js.map b/apps/settings/js/vue-vendors-settings-apps-settings-users.js.map
diff --git a/apps/settings/js/vue-vendors-settings-apps.js b/apps/settings/js/vue-vendors-settings-apps.js
diff --git a/apps/settings/js/vue-vendors-settings-apps.js.map b/apps/settings/js/vue-vendors-settings-apps.js.map
diff --git a/apps/settings/js/vue-vendors-settings-users.js b/apps/settings/js/vue-vendors-settings-users.js
diff --git a/apps/settings/js/vue-vendors-settings-users.js.map b/apps/settings/js/vue-vendors-settings-users.js.map
diff --git a/apps/settings/src/store/index.js b/apps/settings/src/store/index.js
@@ -27,6 +27,7 @@ import users from './users'
 import apps from './apps'
 import settings from './settings'
 import oc from './oc'
+import { showError } from '@nextcloud/dialogs'
 
 Vue.use(Vuex)
 
@@ -36,9 +37,9 @@ const mutations = {
 	API_FAILURE(state, error) {
 		try {
 			const message = error.error.response.data.ocs.meta.message
-			OC.Notification.showHtml(t('settings', 'An error occured during the request. Unable to proceed.') + '<br>' + message, { timeout: 7 })
+			showError(t('settings', 'An error occured during the request. Unable to proceed.') + '<br>' + message, { isHTML: true })
 		} catch (e) {
-			OC.Notification.showTemporary(t('settings', 'An error occured during the request. Unable to proceed.'))
+			showError(t('settings', 'An error occured during the request. Unable to proceed.'))
 		}
 		console.error(state, error)
 	},