[ARVADOS] updated: 1edad4ad7a8c239b36b6f10565ee36cbeab67ddb

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/_show_files.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  1edad4ad7a8c239b36b6f10565ee36cbeab67ddb (commit)
      from  550997435f03118e51571994acc07273907bc6fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1edad4ad7a8c239b36b6f10565ee36cbeab67ddb
Author: Tim Pierce <twp at curoverse.com>
Date:   Wed Oct 29 11:40:52 2014 -0400

    4088: filter only on files
    
    Only apply the regex filter to files; continue to process subdirectories
    as normal in order to keep the appropriate filename hierarchy.

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 327c1ae..9cd77b0 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -55,7 +55,7 @@
   <% file_tree.reject { |(dirname, filename, size)|
        # Eliminate any files that don't match file_regex
        # (or accept all files if no file_regex was given)
-       file_regex and !file_regex.match(filename)
+       size and file_regex and !file_regex.match(filename)
        }
        .take(10000)
        .each_with_index do |(dirname, filename, size), index| %>

-----------------------------------------------------------------------


hooks/post-receive
--