diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-29 11:25:52 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-29 11:25:52 +0100 |
| commit | 911613f7114c3f2c95b364b8b3d21ced5ee96283 (patch) | |
| tree | 289c9a487c85c7875660d936fab64bfe863b41d7 /apps/files_external/controller/storagescontroller.php | |
| parent | c7f409713e8e2d44bc83c0e811bc5b2b46649080 (diff) | |
| parent | 9a4d37f626dca4663ea7d25f78f7c1f174306ab5 (diff) | |
| download | nextcloud-server-911613f7114c3f2c95b364b8b3d21ced5ee96283.tar.gz nextcloud-server-911613f7114c3f2c95b364b8b3d21ced5ee96283.zip | |
Merge pull request #19100 from owncloud/ext-tooltip-unavailable
Display external storage status as tooltip
Diffstat (limited to 'apps/files_external/controller/storagescontroller.php')
| -rw-r--r-- | apps/files_external/controller/storagescontroller.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php index f754565f628..048f3588ed7 100644 --- a/apps/files_external/controller/storagescontroller.php +++ b/apps/files_external/controller/storagescontroller.php @@ -237,9 +237,21 @@ abstract class StoragesController extends Controller { ) ); } catch (InsufficientDataForMeaningfulAnswerException $e) { - $storage->setStatus(\OC_Mount_Config::STATUS_INDETERMINATE); + $storage->setStatus( + \OC_Mount_Config::STATUS_INDETERMINATE, + $this->l10n->t('Insufficient data: %s', [$e->getMessage()]) + ); } catch (StorageNotAvailableException $e) { - $storage->setStatus(\OC_Mount_Config::STATUS_ERROR); + $storage->setStatus( + \OC_Mount_Config::STATUS_ERROR, + $e->getMessage() + ); + } catch (\Exception $e) { + // FIXME: convert storage exceptions to StorageNotAvailableException + $storage->setStatus( + \OC_Mount_Config::STATUS_ERROR, + get_class($e).': '.$e->getMessage() + ); } } |