From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 12 Oct 2020 19:42:20 +0000 (-0400)
Subject: 16989: setup_on_activate needs to happen after update, not before
X-Git-Tag: 2.1.0^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9c68245e24eb0553c2bb56c4cfbee60bda469281

16989: setup_on_activate needs to happen after update, not before

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 34a123e724..6f30b27a95 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -26,7 +26,7 @@ class User < ArvadosModel
   before_update :verify_repositories_empty, :if => Proc.new {
     username.nil? and username_changed?
   }
-  before_update :setup_on_activate
+  after_update :setup_on_activate
 
   before_create :check_auto_admin
   before_create :set_initial_username, :if => Proc.new {