From ad52b2d79125e2f4ca7c535f27184fb385fca79c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 25 Sep 2014 22:36:07 -0400 Subject: [PATCH] Mirror fix on transfer repo --- models/action.go | 16 ++++++--- models/repo.go | 25 ++++++-------- routers/repo/setting.go | 2 +- templates/user/dashboard/dashboard.tmpl | 43 +------------------------ templates/user/dashboard/feeds.tmpl | 2 +- 5 files changed, 25 insertions(+), 63 deletions(-) diff --git a/models/action.go b/models/action.go index 46500a9260..3fb33f939a 100644 --- a/models/action.go +++ b/models/action.go @@ -350,10 +350,18 @@ func NewRepoAction(u *User, repo *Repository) (err error) { // TransferRepoAction adds new action for transfering repository. func TransferRepoAction(u, newUser *User, repo *Repository) (err error) { - if err = NotifyWatchers(&Action{ActUserId: u.Id, ActUserName: u.Name, ActEmail: u.Email, - OpType: TRANSFER_REPO, RepoId: repo.Id, RepoUserName: newUser.Name, - RepoName: repo.Name, - IsPrivate: repo.IsPrivate}); err != nil { + action := &Action{ + ActUserId: u.Id, + ActUserName: u.Name, + ActEmail: u.Email, + OpType: TRANSFER_REPO, + RepoId: repo.Id, + RepoUserName: newUser.Name, + RepoName: repo.Name, + IsPrivate: repo.IsPrivate, + Content: path.Join(repo.Owner.LowerName, repo.LowerName), + } + if err = NotifyWatchers(action); err != nil { log.Error(4, "NotifyWatchers: %d/%s", u.Id, repo.Name) return err } diff --git a/models/repo.go b/models/repo.go index 8e7ab96ba6..a157b0012a 100644 --- a/models/repo.go +++ b/models/repo.go @@ -669,22 +669,23 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) error { return err } - curRepoLink := path.Join(u.LowerName, repo.LowerName) + owner := repo.Owner + oldRepoLink := path.Join(owner.LowerName, repo.LowerName) // Delete all access first if current owner is an organization. - if u.IsOrganization() { - if _, err = sess.Where("repo_name=?", curRepoLink).Delete(new(Access)); err != nil { + if owner.IsOrganization() { + if _, err = sess.Where("repo_name=?", oldRepoLink).Delete(new(Access)); err != nil { sess.Rollback() return fmt.Errorf("fail to delete current accesses: %v", err) } } else { - if _, err = sess.Where("repo_name=?", curRepoLink).And("user_name=?", u.LowerName). + if _, err = sess.Where("repo_name=?", oldRepoLink).And("user_name=?", owner.LowerName). Update(&Access{UserName: newUser.LowerName}); err != nil { sess.Rollback() return err } } - if _, err = sess.Where("repo_name=?", curRepoLink). + if _, err = sess.Where("repo_name=?", oldRepoLink). Update(&Access{RepoName: path.Join(newUser.LowerName, repo.LowerName)}); err != nil { sess.Rollback() return err @@ -703,7 +704,7 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) error { return err } - if _, err = sess.Exec("UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?", u.Id); err != nil { + if _, err = sess.Exec("UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?", owner.Id); err != nil { sess.Rollback() return err } @@ -758,7 +759,7 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) error { } // Change repository directory name. - if err = os.Rename(RepoPath(u.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil { + if err = os.Rename(RepoPath(owner.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil { sess.Rollback() return err } @@ -767,14 +768,8 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) error { return err } - // Add watch of new owner to repository. - if !newUser.IsOrganization() { - if err = WatchRepo(newUser.Id, repo.Id, true); err != nil { - log.Error(4, "WatchRepo", err) - } - } - if err = WatchRepo(u.Id, repo.Id, false); err != nil { - log.Error(4, "WatchRepo2", err) + if err = WatchRepo(newUser.Id, repo.Id, true); err != nil { + log.Error(4, "WatchRepo", err) } if err = TransferRepoAction(u, newUser, repo); err != nil { diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 137d104f9d..17ea3a441c 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -112,7 +112,7 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) { } else if !isExist { ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_owner_name"), SETTINGS_OPTIONS, nil) return - } else if err = models.TransferOwnership(ctx.Repo.Owner, newOwner, ctx.Repo.Repository); err != nil { + } else if err = models.TransferOwnership(ctx.User, newOwner, ctx.Repo.Repository); err != nil { if err == models.ErrRepoAlreadyExist { ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), SETTINGS_OPTIONS, nil) } else { diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index b14b79e320..02c0102e42 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -5,48 +5,7 @@
{{template "ng/base/alert" .}}
- {{range .Feeds}} -
-
- -
-
-

- {{.GetActUserName}} - {{if eq .GetOpType 1}} - {{$.i18n.Tr "action.create_repo" AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} - {{else if eq .GetOpType 5}} - {{$.i18n.Tr "action.commit_repo" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} - {{else if eq .GetOpType 6}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}} - {{else if eq .GetOpType 8}} - {{$.i18n.Tr "action.transfer_repo" .GetRepoName AppSubUrl .GetRepoLink .GetRepoLink | Str2html}} - {{else if eq .GetOpType 10}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}} - {{end}} -

- {{if eq .GetOpType 5}} -
-
    - {{ $push := ActionContent2Commits .}} - {{ $repoLink := .GetRepoLink}} - {{range $push.Commits}} -
  • {{ShortSha .Sha1}} {{.Message}}
    • - {{end}} -
-
- {{else if eq .GetOpType 6}} -

{{index .GetIssueInfos 1}}

- {{else if eq .GetOpType 10}} -

{{index .GetIssueInfos 1}}

- {{end}} -

{{TimeSince .GetCreate $.i18n.Lang}}

-
- -
- {{end}} + {{template "user/dashboard/feeds" .}}