diff options
Diffstat (limited to 'internal/db/org.go')
| -rw-r--r-- | internal/db/org.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/internal/db/org.go b/internal/db/org.go index 9685e567..b11123c6 100644 --- a/internal/db/org.go +++ b/internal/db/org.go @@ -15,6 +15,7 @@ import ( "xorm.io/xorm" "gogs.io/gogs/internal/errutil" + "gogs.io/gogs/internal/repoutil" "gogs.io/gogs/internal/userutil" ) @@ -72,7 +73,7 @@ func (org *User) GetMembers(limit int) error { org.Members = make([]*User, len(ous)) for i, ou := range ous { - org.Members[i], err = GetUserByID(ou.Uid) + org.Members[i], err = Users.GetByID(context.TODO(), ou.Uid) if err != nil { return err } @@ -166,7 +167,7 @@ func CreateOrganization(org, owner *User) (err error) { return fmt.Errorf("insert team-user relation: %v", err) } - if err = os.MkdirAll(UserPath(org.Name), os.ModePerm); err != nil { + if err = os.MkdirAll(repoutil.UserPath(org.Name), os.ModePerm); err != nil { return fmt.Errorf("create directory: %v", err) } @@ -366,11 +367,11 @@ func RemoveOrgUser(orgID, userID int64) error { return nil } - user, err := GetUserByID(userID) + user, err := Users.GetByID(context.TODO(), userID) if err != nil { return fmt.Errorf("GetUserByID [%d]: %v", userID, err) } - org, err := GetUserByID(orgID) + org, err := Users.GetByID(context.TODO(), orgID) if err != nil { return fmt.Errorf("GetUserByID [%d]: %v", orgID, err) } |