aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-03-11 09:59:56 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-03-11 12:19:32 +0100
commit1374f25a0be9f88c3a194887760c81942721cf40 (patch)
tree86eadf83c82ff3b901232d06a73f62c49ac9c0b6
parent8db687a1cddd13c2a6fb6b16038d20275bd31e17 (diff)
downloadnextcloud-server-1374f25a0be9f88c3a194887760c81942721cf40.tar.gz
nextcloud-server-1374f25a0be9f88c3a194887760c81942721cf40.zip
display app update error messages - fixes #14611
-rw-r--r--settings/js/apps.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index f844bcc08e2..6626e058960 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -235,7 +235,11 @@ OC.Settings.Apps = OC.Settings.Apps || {
OC.Settings.Apps.hideErrorMessage(appId);
$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appId},function(result) {
if(!result || result.status !== 'success') {
- OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while updating app'));
+ if (result.data && result.data.message) {
+ OC.Settings.Apps.showErrorMessage(appId, result.data.message);
+ } else {
+ OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while updating app'));
+ }
element.val(oldButtonText);
}
else {