2809: Merge branch 'master' into 2809-workbench-rails4 refs #2809

[arvados.git] / services / api / app / models / collection.rb

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 495b9fefe316339864d6c35dfd2cb18e74a3d20b..745f0bf38b610d7d276bfae3c87c8fd8f6c87f1a 100644 (file)
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -1,5 +1,5 @@
 class Collection < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
 
@@ -119,15 +119,19 @@ class Collection < ArvadosModel
           end
         end
       end
+    end
 
-      @files = []
-      tmp.each do |k, v|
-        re = k.match(/^(.+)\/(.+)/)
-        @files << [re[1], re[2], v]
-      end
+    @files = []
+    tmp.each do |k, v|
+      re = k.match(/^(.+)\/(.+)/)
+      @files << [re[1], re[2], v]
     end
   end
 
+  def self.uuid_like_pattern
+    "________________________________+%"
+  end
+
   def self.normalize_uuid uuid
     hash_part = nil
     size_part = nil