From 5458175e9d18ae2d276ce6231441865789571a34 Mon Sep 17 00:00:00 2001 From: Benjamin Morrise Date: Wed, 29 May 2019 14:26:56 -0400 Subject: [PATCH] [PDI-18113] Fix for showing hidden files/folders for admin in search --- .../RepositoryBrowserController.java | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/plugins/file-open-save/core/src/main/java/org/pentaho/repo/controller/RepositoryBrowserController.java b/plugins/file-open-save/core/src/main/java/org/pentaho/repo/controller/RepositoryBrowserController.java index 8aab8e88ab89..5badc88f6902 100644 --- a/plugins/file-open-save/core/src/main/java/org/pentaho/repo/controller/RepositoryBrowserController.java +++ b/plugins/file-open-save/core/src/main/java/org/pentaho/repo/controller/RepositoryBrowserController.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2018 Hitachi Vantara. All rights reserved. + * Copyright 2017-2019 Hitachi Vantara. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -552,28 +552,13 @@ public RepositoryDirectory loadFilesAndFolders( String path ) { } public List search( String path, String filter ) { - RepositoryDirectoryInterface repositoryDirectoryInterface = findDirectory( path ); + RepositoryDirectory repositoryDirectory = loadFilesAndFolders( path ); List repositoryObjects = new ArrayList<>(); - List repositoryObjects1 = ( (RepositoryExtended) getRepository() ).getChildren( - repositoryDirectoryInterface.getObjectId().getId(), filter ); - for ( RepositoryObjectInterface repositoryObject : repositoryObjects1 ) { - if ( repositoryObject instanceof RepositoryDirectoryInterface ) { - RepositoryDirectory repositoryDirectory = new RepositoryDirectory(); - repositoryDirectory.setPath( path + "/" + repositoryObject.getName() ); - repositoryDirectory.setName( repositoryObject.getName() ); - repositoryDirectory.setObjectId( repositoryObject.getObjectId() ); - repositoryObjects.add( repositoryDirectory ); - } else { - RepositoryFile repositoryFile = new RepositoryFile(); - repositoryFile.setPath( path + "/" + repositoryObject.getName() ); - repositoryFile.setName( repositoryObject.getName() ); - repositoryFile.setType( ( (RepositoryObject) repositoryObject ).getObjectType() == RepositoryObjectType - .TRANSFORMATION ? TRANSFORMATION : JOB ); - repositoryFile.setObjectId( repositoryObject.getObjectId() ); - repositoryObjects.add( repositoryFile ); + for ( org.pentaho.repo.model.RepositoryObject repositoryObject : repositoryDirectory.getChildren() ) { + if ( repositoryObject.getName().contains( filter ) ) { + repositoryObjects.add( repositoryObject ); } } - return repositoryObjects; }