[Pkg-owncloud-commits] [owncloud] 21/118: display app update error messages - fixes #14611

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 1374f25a0be9f88c3a194887760c81942721cf40
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Mar 11 09:59:56 2015 +0100

    display app update error messages - fixes #14611
---
 settings/js/apps.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index f844bcc..6626e05 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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git