summaryrefslogtreecommitdiffstats
path: root/settings
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 09:59:56 +0100
commitffe06ac5c727913e5bff225a1c485e504a287e64 (patch)
tree01fb3e616ac4e7988d91723dcfae822c087d5c2b /settings
parentcfaee93552b519b8e017e63fd5a82b1e5c9f951b (diff)
downloadnextcloud-server-ffe06ac5c727913e5bff225a1c485e504a287e64.tar.gz
nextcloud-server-ffe06ac5c727913e5bff225a1c485e504a287e64.zip
display app update error messages - fixes #14611
Diffstat (limited to 'settings')
-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 c15d6a0f74d..7330f426af7 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 {