Commit abb726c9 authored by Bernhard Posselt's avatar Bernhard Posselt
Browse files

Merge pull request #14789 from owncloud/better-app-install-error-messages

display app update error messages
parents 3df1d933 ffe06ac5
......@@ -202,20 +202,21 @@ class OC_Installer{
/**
* update an app by it's id
* @param integer $ocsid
*
* @param integer $ocsId
* @return bool
* @throws Exception
*/
public static function updateAppByOCSId($ocsid) {
$appdata = OCSClient::getApplication($ocsid);
$download = OCSClient::getApplicationDownload($ocsid, 1);
public static function updateAppByOCSId($ocsId) {
$appData = OCSClient::getApplication($ocsId);
$download = OCSClient::getApplicationDownload($ocsId, 1);
if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') {
$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
$info = array(
'source' => 'http',
'href' => $download['downloadlink'],
'appdata' => $appdata
'appdata' => $appData
);
} else {
throw new \Exception('Could not fetch app info!');
......@@ -285,7 +286,7 @@ class OC_Installer{
* @return array
* @throws \Exception
*/
public static function checkAppsIntegrity($data = array(), $extractDir, $path, $isShipped=false) {
public static function checkAppsIntegrity($data, $extractDir, $path, $isShipped=false) {
$l = \OC::$server->getL10N('lib');
//load the info.xml file of the app
if(!is_file($extractDir.'/appinfo/info.xml')) {
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment