Browse Source

fix user migration

abhishek9686 10 months ago
parent
commit
42b8a03660
1 changed files with 2 additions and 1 deletions
  1. 2 1
      migrate/migrate.go

+ 2 - 1
migrate/migrate.go

@@ -398,7 +398,6 @@ func syncUsers() {
 	if err == nil {
 		for _, user := range users {
 			user := user
-			logic.AddGlobalNetRolesToAdmins(user)
 			if user.PlatformRoleID == models.AdminRole && !user.IsAdmin {
 				user.IsAdmin = true
 				logic.UpsertUser(user)
@@ -409,6 +408,7 @@ func syncUsers() {
 			}
 			if user.PlatformRoleID.String() != "" {
 				logic.MigrateUserRoleAndGroups(user)
+				logic.AddGlobalNetRolesToAdmins(user)
 				continue
 			}
 			user.AuthType = models.BasicAuth
@@ -430,6 +430,7 @@ func syncUsers() {
 				user.PlatformRoleID = models.ServiceUser
 			}
 			logic.UpsertUser(user)
+			logic.AddGlobalNetRolesToAdmins(user)
 			logic.MigrateUserRoleAndGroups(user)
 		}
 	}