From ab747f279088c9ed6114c4227c71173ebd1e6f00 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 16 Mar 2014 05:24:13 -0400 Subject: Fix delete SSH key in file --- models/user.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'models/user.go') diff --git a/models/user.go b/models/user.go index a0e4bb80..ffeb7252 100644 --- a/models/user.go +++ b/models/user.go @@ -142,6 +142,7 @@ func UpdateUser(user *User) (err error) { // DeleteUser completely deletes everything of the user. func DeleteUser(user *User) error { + // Check ownership of repository. count, err := GetRepositoryCount(user) if err != nil { return errors.New("modesl.GetRepositories: " + err.Error()) @@ -151,6 +152,17 @@ func DeleteUser(user *User) error { // TODO: check issues, other repos' commits + // Delete SSH keys. + keys := make([]PublicKey, 0, 10) + if err = orm.Find(&keys, &PublicKey{OwnerId: user.Id}); err != nil { + return err + } + for _, key := range keys { + if err = DeletePublicKey(&key); err != nil { + return err + } + } + _, err = orm.Delete(user) // TODO: delete and update follower information. return err -- cgit v1.2.3 From 0754dd2f955c70994753cd18228333ca32ceee72 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 16 Mar 2014 06:38:39 -0400 Subject: Add delete all feeds when delete account --- models/user.go | 7 ++++++- routers/user/user.go | 2 +- templates/user/publickey.tmpl | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'models/user.go') diff --git a/models/user.go b/models/user.go index ffeb7252..463d4a27 100644 --- a/models/user.go +++ b/models/user.go @@ -152,7 +152,12 @@ func DeleteUser(user *User) error { // TODO: check issues, other repos' commits - // Delete SSH keys. + // Delete all feeds. + if _, err = orm.Delete(&Action{UserId: user.Id}); err != nil { + return err + } + + // Delete all SSH keys. keys := make([]PublicKey, 0, 10) if err = orm.Find(&keys, &PublicKey{OwnerId: user.Id}); err != nil { return err diff --git a/routers/user/user.go b/routers/user/user.go index e13f6909..b87076d9 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -168,7 +168,7 @@ func Delete(ctx *middleware.Context) { } } - ctx.Render.HTML(200, "user/delete", ctx.Data) + ctx.Render.Redirect("/", 302) } const ( diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl index b671f63f..3b2cc112 100644 --- a/templates/user/publickey.tmpl +++ b/templates/user/publickey.tmpl @@ -5,7 +5,7 @@

Account Setting

-
-

Delete Account

-

{{if not .HasError}}The operation will delete your account permanently. Sorry to see you go, but we know you'll back soon.{{else}}{{.ErrorMsg}}{{end}}

-
-
- +

Delete Account

+

{{if not .HasError}}The operation will delete your account permanently. Sorry to see you go, but we know you'll back soon.{{else}}{{.ErrorMsg}}{{end}}

+
+ +
+
+
- {{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl index 3b2cc112..104575d4 100644 --- a/templates/user/publickey.tmpl +++ b/templates/user/publickey.tmpl @@ -18,12 +18,14 @@

SSH Keys

{{if .AddSSHKeySuccess}}

New SSH Key has been added !

{{else if .HasError}}

{{.ErrorMsg}}

{{end}}