From 53ac9bdda17e5141fceaec1a895f733c13c73c7a Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Tue, 29 Jan 2019 12:22:34 +0100 Subject: Implement frontend for search/rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl Move to vuex Signed-off-by: Julius Härtl --- core/Controller/CollaborationResourcesController.php | 2 +- core/src/OCP/collaboration.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core') 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) -- cgit v1.2.3