mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

display app update error messages - fixes #14611

This commit is contained in:
Thomas Müller 2015-03-11 09:59:56 +01:00
parent cfaee93552
commit ffe06ac5c7
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/installer.php
View File

@ -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')) {

6
settings/js/apps.js
View File

@ -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 {