Mirror fix on transfer repo

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 6595cbe41647cf680e5546f86b459ea9a9bf4b36..5d9f221413195de2d103577ce31ab66468260a55 100644 (file)
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -574,7 +574,7 @@ create_repo = created repository <a href="%s/%s">%s</a>
 commit_repo = pushed to <a href="%s/%s/src/%s">%s</a> at <a href="%s/%s">%s</a>
 create_issue = opened issue <a href="%s/%s/issues/%s">%s#%s</a>
 comment_issue = commented on issue <a href="%s/%s/issues/%s">%s#%s</a>
-transfer_repo = transfered repository <code>%s</code> to <a href="%s%s">%s</a>
+transfer_repo = transfered repository <code>%s</code> to <a href="/%s%s">%s</a>
 
 [tool]
 ago = ago

diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 9b337621acebd1ac132ebf72adba9cae1b01b700..b21fa5730298c0083cf6e2322326b39a9c45e207 100644 (file)
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -572,7 +572,7 @@ create_repo = 创建了仓库 <a href="%s/%s">%s</a>
 commit_repo = 推送了 <a href="%s/%s/src/%s">%s</a> 分支的代码到 <a href="%s/%s">%s</a>
 create_issue = 创建了工单 <a href="%s/%s/issues/%s">%s#%s</a>
 comment_issue = 评论了工单 <a href="%s/%s/issues/%s">%s#%s</a>
-transfer_repo = 将仓库 <code>%s</code> 转移至 <a href="%s%s">%s</a>
+transfer_repo = 将仓库 <code>%s</code> 转移至 <a href="/%s%s">%s</a>
 
 [tool]
 ago = 之前

diff --git a/models/action.go b/models/action.go
index 3fb33f939a0fd5a5219e8cd1636d79929a1778f1..9bd9da67c3cc7823d2d3fa28164dcfce964aafd7 100644 (file)
--- a/models/action.go
+++ b/models/action.go
@@ -366,6 +366,13 @@ func TransferRepoAction(u, newUser *User, repo *Repository) (err error) {
                return err
        }
 
+       // Remove watch for organization.
+       if repo.Owner.IsOrganization() {
+               if err = WatchRepo(repo.Owner.Id, repo.Id, false); err != nil {
+                       log.Error(4, "WatchRepo", err)
+               }
+       }
+
        log.Trace("action.TransferRepoAction: %s/%s", u.Name, repo.Name)
        return err
 }