allow admin to change object UUIDs

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 09b61413b4dcceb7d4166838a83276cc6cf70aa3..ec99c9efb90a920b24652b044e1815981703232a 100644 (file)
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -58,11 +58,11 @@ class ArvadosModel < ActiveRecord::Base
       logger.warn "Inactive user #{current_user.uuid} tried to update #{self.class.to_s} #{self.uuid_was}"
       return false
     end
+    return true if current_user.is_admin
     if self.uuid_changed?
       logger.warn "User #{current_user.uuid} tried to change uuid of #{self.class.to_s} #{self.uuid_was} to #{self.uuid}"
       return false
     end
-    return true if current_user.is_admin
     if self.owner_uuid_changed?
       if current_user.uuid == self.owner_uuid or
           current_user.can? write: self.owner_uuid