20640: Merge branch 'main' into 20640-computed-permissions-api

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

diff --git a/services/api/app/models/group.rb b/services/api/app/models/group.rb
index 9b517e599800a3f7f8f22b1b6008b8f5464941ef..6d30fe1bab0eb1a0ecde129972e9daa5b6986989 100644 (file)
--- a/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@ -262,7 +262,7 @@ insert into frozen_groups (uuid) select uuid from temptable where is_frozen on c
 
   def before_ownership_change
     if owner_uuid_changed? and !self.owner_uuid_was.nil?
-      MaterializedPermission.where(user_uuid: owner_uuid_was, target_uuid: uuid).delete_all
+      ComputedPermission.where(user_uuid: owner_uuid_was, target_uuid: uuid).delete_all
       update_permissions self.owner_uuid_was, self.uuid, REVOKE_PERM
     end
   end
@@ -275,7 +275,7 @@ insert into frozen_groups (uuid) select uuid from temptable where is_frozen on c
 
   def clear_permissions_trash_frozen
     Link.where(link_class: 'permission', tail_uuid: self.uuid).destroy_all
-    MaterializedPermission.where(target_uuid: uuid).delete_all
+    ComputedPermission.where(target_uuid: uuid).delete_all
     ActiveRecord::Base.connection.exec_delete(
       "delete from trashed_groups where group_uuid=$1",
       "Group.clear_permissions_trash_frozen",