diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-01-29 12:22:34 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-03-01 20:56:18 +0100 |
| commit | 53ac9bdda17e5141fceaec1a895f733c13c73c7a (patch) | |
| tree | 19c81b212c82930e948dc98ae0cef5be5d427de3 /core | |
| parent | 3777df64ae0a4a3d79e000541c0c512fb3ebf304 (diff) | |
| download | nextcloud-server-53ac9bdda17e5141fceaec1a895f733c13c73c7a.tar.gz nextcloud-server-53ac9bdda17e5141fceaec1a895f733c13c73c7a.zip | |
Implement frontend for search/rename
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Move to vuex
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/CollaborationResourcesController.php | 2 | ||||
| -rw-r--r-- | core/src/OCP/collaboration.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php index 565e0ba4739..a15904a4c2a 100644 --- a/core/Controller/CollaborationResourcesController.php +++ b/core/Controller/CollaborationResourcesController.php @@ -193,7 +193,7 @@ class CollaborationResourcesController extends OCSController { return [ 'id' => $collection->getId(), 'name' => $collection->getName(), - 'resources' => array_map([$this, 'prepareResources'], $collection->getResources()), + 'resources' => array_values(array_filter(array_map([$this, 'prepareResources'], $collection->getResources()))), ]; } diff --git a/core/src/OCP/collaboration.js b/core/src/OCP/collaboration.js index a74834e741e..54b580406ed 100644 --- a/core/src/OCP/collaboration.js +++ b/core/src/OCP/collaboration.js @@ -49,7 +49,7 @@ export default { return Object.keys(types); }, getIcon(type) { - return types[type].icon; + return types[type].icon || ''; }, getLabel(type) { return t('files_sharing', 'Link to a {label}', { label: types[type].typeString || type }, 1) |