3762: Expose Discovery func in arvadosclient. Use Discovery to get defaultTrashLifeti...

[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 1b07e507da31eb9a394fafa3e7e09e9eaeb260b7..89ad874cd7d211aae90f841927a620150af1ab9b 100644 (file)
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -5,11 +5,13 @@ class Collection < ArvadosModel
   include KindAndEtag
   include CommonApiTemplate
 
+  serialize :properties, Hash
+
   before_validation :check_encoding
   before_validation :check_signatures
   before_validation :strip_manifest_text
   before_validation :set_portable_data_hash
-  before_validation :maybe_clear_redundancy_confirmed
+  before_validation :maybe_clear_replication_confirmed
   validate :ensure_hash_matches_manifest_text
   before_save :set_file_names
 
@@ -324,7 +326,7 @@ class Collection < ArvadosModel
      portable_manifest.bytesize.to_s)
   end
 
-  def maybe_clear_redundancy_confirmed
+  def maybe_clear_replication_confirmed
     if manifest_text_changed?
       # If the new manifest_text contains locators whose hashes
       # weren't in the old manifest_text, storage replication is no