X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e16542e3cb4fddf05c407cb013c9e1573eb9c289..0110ce93702def9a641d92d90d5544d4d0adf22b:/services/api/app/models/collection.rb

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 1ffaa6a319..292cf34ccb 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -22,23 +22,24 @@ class Collection < ArvadosModel
 
   before_validation :default_empty_manifest
   before_validation :default_storage_classes, on: :create
-  before_validation :default_properties, on: :create
+  before_validation :managed_properties, on: :create
   before_validation :check_encoding
   before_validation :check_manifest_validity
   before_validation :check_signatures
   before_validation :strip_signatures_and_update_replication_confirmed
+  before_validation :name_null_if_empty
   validate :ensure_pdh_matches_manifest_text
   validate :ensure_storage_classes_desired_is_not_empty
   validate :ensure_storage_classes_contain_non_empty_strings
   validate :versioning_metadata_updates, on: :update
   validate :past_versions_cannot_be_updated, on: :update
-  validate :protected_default_properties_updates, on: :update
+  validate :protected_managed_properties_updates, on: :update
   after_validation :set_file_count_and_total_size
   before_save :set_file_names
   around_update :manage_versioning, unless: :is_past_version?
 
   api_accessible :user, extend: :common do |t|
-    t.add :name
+    t.add lambda { |x| x.name || "" }, as: :name
     t.add :description
     t.add :properties
     t.add :portable_data_hash
@@ -77,6 +78,7 @@ class Collection < ArvadosModel
                 # correct timestamp in signed_manifest_text.
                 'manifest_text' => ['manifest_text', 'trash_at', 'is_trashed'],
                 'unsigned_manifest_text' => ['manifest_text'],
+                'name' => ['name'],
                 )
   end
 
@@ -195,6 +197,12 @@ class Collection < ArvadosModel
     end
   end
 
+  def name_null_if_empty
+    if name == ""
+      self.name = nil
+    end
+  end
+
   def set_file_names
     if self.manifest_text_changed?
       self.file_names = manifest_files
@@ -513,7 +521,7 @@ class Collection < ArvadosModel
       joins("JOIN collections ON links.head_uuid = collections.uuid").
       order("links.created_at DESC")
 
-    docker_image_formats = Rails.configuration.Containers.SupportedDockerImageFormats
+    docker_image_formats = Rails.configuration.Containers.SupportedDockerImageFormats.keys.map(&:to_s)
 
     if (docker_image_formats.include? 'v1' and
         docker_image_formats.include? 'v2') or filter_compatible_format == false
@@ -608,19 +616,19 @@ class Collection < ArvadosModel
     self.storage_classes_confirmed ||= []
   end
 
-  # Sets default properties at creation time
-  def default_properties
-    default_props = Rails.configuration.Collections.ManagedProperties.with_indifferent_access
-    if default_props.empty?
+  # Sets managed properties at creation time
+  def managed_properties
+    managed_props = Rails.configuration.Collections.ManagedProperties.with_indifferent_access
+    if managed_props.empty?
       return
     end
-    (default_props.keys - self.properties.keys).each do |key|
-      if default_props[key].has_key?('value')
-        self.properties[key] = default_props[key]['value']
-      elsif default_props[key]['function'].andand == 'original_owner'
+    (managed_props.keys - self.properties.keys).each do |key|
+      if managed_props[key].has_key?('Value')
+        self.properties[key] = managed_props[key]['Value']
+      elsif managed_props[key]['Function'].andand == 'original_owner'
         self.properties[key] = self.user_owner_uuid
       else
-        logger.warn "Unidentified default property definition '#{key}': #{default_props[key].inspect}"
+        logger.warn "Unidentified default property definition '#{key}': #{managed_props[key].inspect}"
       end
     end
   end
@@ -686,13 +694,13 @@ class Collection < ArvadosModel
     end
   end
 
-  def protected_default_properties_updates
-    default_properties = Rails.configuration.Collections.ManagedProperties.with_indifferent_access
-    if default_properties.empty? || !properties_changed? || current_user.is_admin
+  def protected_managed_properties_updates
+    managed_properties = Rails.configuration.Collections.ManagedProperties.with_indifferent_access
+    if managed_properties.empty? || !properties_changed? || current_user.is_admin
       return true
     end
-    protected_props = default_properties.keys.select do |p|
-      Rails.configuration.Collections.ManagedProperties[p]['protected']
+    protected_props = managed_properties.keys.select do |p|
+      Rails.configuration.Collections.ManagedProperties[p]['Protected']
     end
     # Pre-existent protected properties can't be updated
     invalid_updates = properties_was.keys.select{|p| properties_was[p] != properties[p]} & protected_props