[ARVADOS] updated: 2.1.0-435-g0dac35776

Git user git at public.arvados.org
Thu Feb 11 15:26:20 UTC 2021


Summary of changes:
 services/api/app/models/arvados_model.rb | 7 -------
 services/api/app/models/group.rb         | 1 -
 2 files changed, 8 deletions(-)

       via  0dac35776e9de76550203c2e1ac47cb7c2bda255 (commit)
      from  656fa186d6f471ceec2f1c996006c31a64a14dba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0dac35776e9de76550203c2e1ac47cb7c2bda255
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Feb 11 10:25:22 2021 -0500

    17119: remove the default project_class again on the group model, it is
           not needed.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 2c5dee91c..f2bae3a4b 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -889,13 +889,6 @@ class ArvadosModel < ApplicationRecord
     }.merge(attributes['scheduling_parameters'] || {})
   end
 
-  # The 'group_class' for a group should default to 'project'
-  def fill_group_defaults
-    if !attributes.key?("group_class") || attributes['group_class'].nil? || attributes['group_class'].empty?
-      self.group_class = 'project'
-    end
-  end
-
   # ArvadosModel.find_by_uuid needs extra magic to allow it to return
   # an object in any class.
   def self.find_by_uuid uuid
diff --git a/services/api/app/models/group.rb b/services/api/app/models/group.rb
index 519dcd307..870e0d0c4 100644
--- a/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@ -16,7 +16,6 @@ class Group < ArvadosModel
   # already know how to properly treat them.
   attribute :properties, :jsonbHash, default: {}
 
-  before_validation :fill_group_defaults
   validate :ensure_filesystem_compatible_name
   validate :check_group_class
   before_create :assign_name

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list