From b742465734fe980578e106e6b035ca9d0aebf02e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 6 Feb 2020 11:42:59 -0500 Subject: [PATCH] 16136: Prioritize 'Function' over 'Value' and ignore null Because arvados-server config-dump will emit "Value: null" even if the original config file didn't provide it. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- services/api/app/models/collection.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 99933ba7e7..caac5611e7 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -624,10 +624,10 @@ class Collection < ArvadosModel return end (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' + if managed_props[key]['Function'] == 'original_owner' self.properties[key] = self.user_owner_uuid + elsif managed_props[key]['Value'] + self.properties[key] = managed_props[key]['Value'] else logger.warn "Unidentified default property definition '#{key}': #{managed_props[key].inspect}" end -- 2.30.2