Merge branch '8784-dir-listings'

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

diff --git a/services/api/app/models/link.rb b/services/api/app/models/link.rb
index f4a7de29e276d065849911ef04c1c78770cc97f6..dc961667b0cd474301c817a3c87c9717ba4424f7 100644 (file)
--- a/services/api/app/models/link.rb
+++ b/services/api/app/models/link.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class Link < ArvadosModel
   include HasUuid
   include KindAndEtag
@@ -8,9 +12,7 @@ class Link < ArvadosModel
   after_update :maybe_invalidate_permissions_cache
   after_create :maybe_invalidate_permissions_cache
   after_destroy :maybe_invalidate_permissions_cache
-  attr_accessor :head_kind, :tail_kind
-  validate :name_link_has_valid_name
-  validate :name_link_owner_is_tail
+  validate :name_links_are_obsolete
 
   api_accessible :user, extend: :common do |t|
     t.add :tail_uuid
@@ -22,11 +24,6 @@ class Link < ArvadosModel
     t.add :properties
   end
 
-  def properties
-    @properties ||= Hash.new
-    super
-  end
-
   def head_kind
     if k = ArvadosModel::resource_class_for_uuid(head_uuid)
       k.kind
@@ -67,27 +64,19 @@ class Link < ArvadosModel
       # permissions for head_uuid and tail_uuid, and invalidate the
       # cache for only those users. (This would require a browseable
       # cache.)
-      User.invalidate_permissions_cache
+      User.invalidate_permissions_cache db_current_time.to_i
     end
   end
 
-  def name_link_has_valid_name
+  def name_links_are_obsolete
     if link_class == 'name'
-      unless name.is_a? String and !name.empty?
-        errors.add('name', 'must be a non-empty string')
-      end
+      errors.add('name', 'Name links are obsolete')
+      false
     else
       true
     end
   end
 
-  def name_link_owner_is_tail
-    if link_class == 'name'
-      self.owner_uuid = tail_uuid
-      ensure_owner_uuid_is_permitted
-    end
-  end
-
   # A user is permitted to create, update or modify a permission link
   # if and only if they have "manage" permission on the object
   # indicated by the permission link's head_uuid.