tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1

Do not autocreate directory for new user/orgs (#4828) (#4849)

Browse source
This commit is contained in:
SagePtr 2018-09-07 02:40:58 +02:00 committed by techknowlogick
parent 3c6cc56143
commit 303d7f7e9c
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
models/org.go
View file

@ -182,10 +182,6 @@ func CreateOrganization(org, owner *User) (err error) {
return fmt.Errorf("insert team-user relation: %v", err) return fmt.Errorf("insert team-user relation: %v", err)
} }
if err = os.MkdirAll(UserPath(org.Name), os.ModePerm); err != nil {
return fmt.Errorf("create directory: %v", err)
}
return sess.Commit() return sess.Commit()
} }

9
models/user.go
View file

@ -798,8 +798,6 @@ func CreateUser(u *User) (err error) {
if _, err = sess.Insert(u); err != nil { if _, err = sess.Insert(u); err != nil {
return err return err
} else if err = os.MkdirAll(UserPath(u.Name), os.ModePerm); err != nil {
return err
} }
return sess.Commit() return sess.Commit()
@ -898,7 +896,12 @@ func ChangeUserName(u *User, newUserName string) (err error) {
return fmt.Errorf("Delete repository wiki local copy: %v", err) return fmt.Errorf("Delete repository wiki local copy: %v", err)
} }
return os.Rename(UserPath(u.Name), UserPath(newUserName)) // Do not fail if directory does not exist
if err = os.Rename(UserPath(u.Name), UserPath(newUserName)); err != nil && !os.IsNotExist(err) {
return fmt.Errorf("Rename user directory: %v", err)
}
return nil
} }
// checkDupEmail checks whether there are the same email with the user // checkDupEmail checks whether there are the same email with the user