From f544a5deb25be101a685ddf88ee14bb04839e656 Mon Sep 17 00:00:00 2001 From: wangjr Date: Wed, 20 Apr 2022 10:38:13 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=88=9B=E5=BB=BAissue=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=B9=B6=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/issue/branch_selector_field.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 4f80c13e5..b0be7c7f4 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -1,6 +1,6 @@ {{if and (not .Issue.IsPull) (not .PageIsComparePull)}} -
+
{{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}} From fb5da398eac8aefa4fbeb7f6709c89632a6ea950 Mon Sep 17 00:00:00 2001 From: wangjr Date: Thu, 21 Apr 2022 14:28:40 +0800 Subject: [PATCH 02/16] fix-1821 --- templates/repo/issue/branch_selector_field.tmpl | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 45 ++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index b0be7c7f4..4f80c13e5 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -1,6 +1,6 @@ {{if and (not .Issue.IsPull) (not .PageIsComparePull)}} -
+
{{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index bcc69a48b..c954ce0d6 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -1,6 +1,49 @@
- {{template "repo/issue/branch_selector_field" .}} + + {{if and (not .Issue.IsPull) (not .PageIsComparePull)}} + +
+
+ {{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}} + +
+
+
+ + +
+
+
+
+ + + {{svg "octicon-git-branch" 16}} {{.i18n.Tr "repo.branches"}} + + + + + {{.i18n.Tr "repo.tags"}} + + +
+
+
+ + +
+
+ +
+ {{end}} {{if .Issue.IsPull }} From 20eb12740f4198c1fa1d3db3aaf78893f0930bdf Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Thu, 21 Apr 2022 16:25:57 +0800 Subject: [PATCH 03/16] #1821 update --- models/issue.go | 32 ++++++++++++++++++++++++++++++++ models/issue_comment.go | 2 ++ routers/repo/issue.go | 25 ++++++++++++++++++++++++- routers/routes/routes.go | 1 + services/issue/content.go | 9 +++++++++ 5 files changed, 68 insertions(+), 1 deletion(-) diff --git a/models/issue.go b/models/issue.go index 19f00d5f3..3a7097977 100755 --- a/models/issue.go +++ b/models/issue.go @@ -775,6 +775,38 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { return sess.Commit() } +// ChangeRef changes issue ref, as the given user. +func (issue *Issue) ChangeRef(doer *User, newRef string) (err error) { + oldRef := issue.Ref + issue.Ref = newRef + + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err + } + + if err = updateIssueCols(sess, issue, "ref"); err != nil { + sess.Rollback() + return fmt.Errorf("UpdateIssueCols: %v", err) + } + + var opts = &CreateCommentOptions{ + Type: CommentTypeRef, + Doer: doer, + Repo: issue.Repo, + Issue: issue, + OldRef: oldRef, + NewRef: newRef, + } + if _, err = createComment(sess, opts); err != nil { + sess.Rollback() + return err + } + + return sess.Commit() +} + // GetTasks returns the amount of tasks in the issues content func (issue *Issue) GetTasks() int { return len(issueTasksPat.FindAllStringIndex(issue.Content, -1)) diff --git a/models/issue_comment.go b/models/issue_comment.go index 60d38452c..ec9441bde 100755 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -48,6 +48,8 @@ const ( CommentTypePullRef // Labels changed CommentTypeLabel + // Ref changed + CommentTypeRef // Milestone changed CommentTypeMilestone // Assignees changed diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 42a6b9609..875c02024 100755 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -432,7 +432,7 @@ func RetrieveRepoMetas(ctx *context.Context, repo *models.Repository, isPull boo return nil } - brs, _, err := ctx.Repo.GitRepo.GetBranches(0,0) + brs, _, err := ctx.Repo.GitRepo.GetBranches(0, 0) if err != nil { ctx.ServerError("GetBranches", err) return nil @@ -1302,6 +1302,29 @@ func UpdateIssueContent(ctx *context.Context) { }) } +// UpdateIssueRef change issue's code reference +func UpdateIssueRef(ctx *context.Context) { + issue := GetActionIssue(ctx) + if ctx.Written() { + return + } + + if !ctx.IsSigned || (ctx.User.ID != issue.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)) { + ctx.Error(403) + return + } + + ref := ctx.Query("ref") + if err := issue_service.ChangeRef(issue, ctx.User, ref); err != nil { + ctx.ServerError("ChangeRef", err) + return + } + + ctx.JSON(200, map[string]interface{}{ + "ref": issue.Ref, + }) +} + // UpdateIssueMilestone change issue's milestone func UpdateIssueMilestone(ctx *context.Context) { issues := getActionIssues(ctx) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 9df429e8b..7af42867c 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -868,6 +868,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/:index", func() { m.Post("/title", repo.UpdateIssueTitle) m.Post("/content", repo.UpdateIssueContent) + m.Post("/ref", repo.UpdateIssueRef) m.Post("/watch", repo.IssueWatch) m.Group("/dependency", func() { m.Post("/add", repo.AddDependency) diff --git a/services/issue/content.go b/services/issue/content.go index 1081e30b5..387930449 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -21,3 +21,12 @@ func ChangeContent(issue *models.Issue, doer *models.User, content string) (err return nil } + +// ChangeRef changes issue ref, as the given user. +func ChangeRef(issue *models.Issue, doer *models.User, ref string) (err error) { + if err := issue.ChangeRef(doer, ref); err != nil { + return err + } + + return nil +} From c16f77e6a337994e32e593c1567e2bbd5c12c0d8 Mon Sep 17 00:00:00 2001 From: wangjr Date: Sun, 24 Apr 2022 11:19:23 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=88=86=E6=94=AF=E5=8F=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/issue/branch_selector_field.tmpl | 4 +- templates/repo/issue/view_content/sidebar.tmpl | 14 +++--- web_src/js/index.js | 60 ++++++++++++++++++------- 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 4f80c13e5..265c14765 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -14,12 +14,12 @@
- + {{svg "octicon-git-branch" 16}} {{.i18n.Tr "repo.branches"}} - + {{.i18n.Tr "repo.tags"}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index c954ce0d6..a08656702 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -8,21 +8,24 @@ {{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}}
-
+
+ +
{{.i18n.Tr "repo.issues.new.clear_labels"}}
+
- + {{svg "octicon-git-branch" 16}} {{.i18n.Tr "repo.branches"}} - + {{.i18n.Tr "repo.tags"}} @@ -31,12 +34,12 @@
@@ -643,3 +646,4 @@
{{end}} {{end}} + diff --git a/web_src/js/index.js b/web_src/js/index.js index 6fdd68d8d..edde96054 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -184,11 +184,11 @@ function initBranchSelector() { }); $selectBranch.find('.reference.column').on('click', function () { $selectBranch.find('.scrolling.reference-list-menu').css('display', 'none'); - $selectBranch.find('.reference .text').removeClass('black'); + $selectBranch.find('.reference .text').addClass('black'); $($(this).data('target')).css('display', 'block'); $(this) - .find('.text') - .addClass('black'); + .find('.text.black') + .removeClass('black'); return false; }); } @@ -231,7 +231,7 @@ function initLabelEdit() { }); } -function updateIssuesMeta(url, action, issueIds, elementId, isAdd) { +function updateIssuesMeta(url, action, issueIds, elementId, isAdd,ref_b) { return new Promise((resolve) => { $.ajax({ type: 'POST', @@ -241,7 +241,8 @@ function updateIssuesMeta(url, action, issueIds, elementId, isAdd) { action, issue_ids: issueIds, id: elementId, - is_add: isAdd + is_add: isAdd, + ref: ref_b, }, success: resolve }); @@ -487,12 +488,14 @@ function initCommentForm() { const promises = []; Object.keys(labels).forEach((elementId) => { const label = labels[elementId]; + console.log("label:",label) const promise = updateIssuesMeta( label['update-url'], label.action, label['issue-id'], elementId, - label['is-checked'] + label['is-checked'], + '' ); promises.push(promise); }); @@ -526,13 +529,19 @@ function initCommentForm() { .removeClass('invisible'); $(this).data('is-checked', 'add'); } - + console.log("$(this)",$(this)) + console.log("$listMenu",$listMenu) + const isRef = ''; + // if ($listMenu.data('update-url').includes("ref")){ + // isRef = $(this).data('data-name'); + // } updateIssuesMeta( $listMenu.data('update-url'), '', $listMenu.data('issue-id'), $(this).data('id'), - $(this).data('is-checked') + $(this).data('is-checked'), + '' ); $listMenu.data('action', 'update'); // Update to reload the page when we updated items return false; @@ -603,7 +612,8 @@ function initCommentForm() { 'clear', $listMenu.data('issue-id'), '', - '' + '', + '', ).then(reload); } @@ -637,10 +647,16 @@ function initCommentForm() { initListSubmits('select-reviewers-modify', 'assignees'); function selectItem(select_id, input_id) { - const $menu = $(`${select_id} .menu`); + let $menu; + if (select_id=='.select-branch'){ + $menu = $(`${select_id} .menu`).eq(1); + }else{ + $menu = $(`${select_id} .menu`); + } + const $list = $(`.ui${select_id}.list`); const hasUpdateAction = $menu.data('action') === 'update'; - + $menu.find('.item:not(.no-select)').on('click', function () { $(this) .parent() @@ -651,12 +667,19 @@ function initCommentForm() { $(this).addClass('selected active'); if (hasUpdateAction) { + let ref = '' + if (select_id=='.select-branch'){ + ref = $(this).data('name'); + console.log("ref:",ref) + } + console.log("ref:",ref) updateIssuesMeta( $menu.data('update-url'), '', $menu.data('issue-id'), $(this).data('id'), - $(this).data('is-checked') + $(this).data('is-checked'), + ref ).then(reload); } switch (input_id) { @@ -696,7 +719,8 @@ function initCommentForm() { '', $menu.data('issue-id'), $(this).data('id'), - $(this).data('is-checked') + $(this).data('is-checked'), + '' ).then(reload); } @@ -709,6 +733,7 @@ function initCommentForm() { // Milestone and assignee selectItem('.select-milestone', '#milestone_id'); selectItem('.select-assignee', '#assignee_id'); + selectItem('.select-branch', ''); } function initInstall() { @@ -811,9 +836,9 @@ function initIssueComments() { const issueId = $(this).data('issue-id'); const id = $(this).data('id'); const isChecked = $(this).data('is-checked'); - + const ref = $(this).data('name'); event.preventDefault(); - updateIssuesMeta(url, '', issueId, id, isChecked).then(reload); + updateIssuesMeta(url, '', issueId, id, isChecked,ref).then(reload); }); $(document).on('click', (event) => { @@ -2900,12 +2925,13 @@ $(document).ready(async () => { }) .get() .join(); - const {url} = this.dataset; + console.log("this:",this) + if (elementId === '0' && url.substr(-9) === '/assignee') { elementId = ''; action = 'clear'; } - updateIssuesMeta(url, action, issueIDs, elementId, '').then(() => { + updateIssuesMeta(url, action, issueIDs, elementId, '','').then(() => { // NOTICE: This reset of checkbox state targets Firefox caching behaviour, as the checkboxes stay checked after reload if (action === 'close' || action === 'open') { // uncheck all checkboxes From dff00b1796f9260e1698f8e6747893af6093ed1b Mon Sep 17 00:00:00 2001 From: wangjr Date: Sun, 24 Apr 2022 14:47:04 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/index.js | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index edde96054..679409b90 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -231,7 +231,7 @@ function initLabelEdit() { }); } -function updateIssuesMeta(url, action, issueIds, elementId, isAdd,ref_b) { +function updateIssuesMeta_new(url, action, issueIds, elementId, isAdd,ref_b) { return new Promise((resolve) => { $.ajax({ type: 'POST', @@ -249,6 +249,24 @@ function updateIssuesMeta(url, action, issueIds, elementId, isAdd,ref_b) { }); } +function updateIssuesMeta(url, action, issueIds, elementId) { + return new Promise((resolve) => { + $.ajax({ + type: 'POST', + url, + data: { + _csrf: csrf, + action, + issue_ids: issueIds, + id: elementId, + is_add: isAdd, + }, + success: resolve + }); + }); +} + + function initRepoStatusChecker() { const migrating = $('#repo_migrating'); $('#repo_migrating_failed').hide(); @@ -495,7 +513,6 @@ function initCommentForm() { label['issue-id'], elementId, label['is-checked'], - '' ); promises.push(promise); }); @@ -531,7 +548,7 @@ function initCommentForm() { } console.log("$(this)",$(this)) console.log("$listMenu",$listMenu) - const isRef = ''; + //const isRef = ''; // if ($listMenu.data('update-url').includes("ref")){ // isRef = $(this).data('data-name'); // } @@ -541,7 +558,6 @@ function initCommentForm() { $listMenu.data('issue-id'), $(this).data('id'), $(this).data('is-checked'), - '' ); $listMenu.data('action', 'update'); // Update to reload the page when we updated items return false; @@ -612,8 +628,8 @@ function initCommentForm() { 'clear', $listMenu.data('issue-id'), '', - '', - '', + '' + ).then(reload); } @@ -670,10 +686,9 @@ function initCommentForm() { let ref = '' if (select_id=='.select-branch'){ ref = $(this).data('name'); - console.log("ref:",ref) } - console.log("ref:",ref) - updateIssuesMeta( + + updateIssuesMeta_new( $menu.data('update-url'), '', $menu.data('issue-id'), @@ -719,8 +734,7 @@ function initCommentForm() { '', $menu.data('issue-id'), $(this).data('id'), - $(this).data('is-checked'), - '' + $(this).data('is-checked') ).then(reload); } @@ -733,7 +747,7 @@ function initCommentForm() { // Milestone and assignee selectItem('.select-milestone', '#milestone_id'); selectItem('.select-assignee', '#assignee_id'); - selectItem('.select-branch', ''); + //selectItem('.select-branch', ''); } function initInstall() { @@ -836,9 +850,9 @@ function initIssueComments() { const issueId = $(this).data('issue-id'); const id = $(this).data('id'); const isChecked = $(this).data('is-checked'); - const ref = $(this).data('name'); + //const ref = $(this).data('name'); event.preventDefault(); - updateIssuesMeta(url, '', issueId, id, isChecked,ref).then(reload); + updateIssuesMeta(url, '', issueId, id, isChecked).then(reload); }); $(document).on('click', (event) => { @@ -2926,12 +2940,12 @@ $(document).ready(async () => { .get() .join(); console.log("this:",this) - + const {url} = this.dataset; if (elementId === '0' && url.substr(-9) === '/assignee') { elementId = ''; action = 'clear'; } - updateIssuesMeta(url, action, issueIDs, elementId, '','').then(() => { + updateIssuesMeta(url, action, issueIDs, elementId, '').then(() => { // NOTICE: This reset of checkbox state targets Firefox caching behaviour, as the checkboxes stay checked after reload if (action === 'close' || action === 'open') { // uncheck all checkboxes From 20c24e8be5cf1ccf5ec8e3f9afc15fd8635b58d2 Mon Sep 17 00:00:00 2001 From: wangjr Date: Sun, 24 Apr 2022 15:01:52 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 679409b90..99fa6fbbd 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -747,7 +747,7 @@ function initCommentForm() { // Milestone and assignee selectItem('.select-milestone', '#milestone_id'); selectItem('.select-assignee', '#assignee_id'); - //selectItem('.select-branch', ''); + selectItem('.select-branch', ''); } function initInstall() { From 00b57718d11ec82df5508dc7a8a343d877633a5e Mon Sep 17 00:00:00 2001 From: wangjr Date: Sun, 24 Apr 2022 16:53:41 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 99fa6fbbd..25185b4bf 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -249,7 +249,7 @@ function updateIssuesMeta_new(url, action, issueIds, elementId, isAdd,ref_b) { }); } -function updateIssuesMeta(url, action, issueIds, elementId) { +function updateIssuesMeta(url, action, issueIds, elementId,isAdd) { return new Promise((resolve) => { $.ajax({ type: 'POST', From 5d9f9b3e571d2ba43733e47316b56d95cd56f50e Mon Sep 17 00:00:00 2001 From: wangjr Date: Sun, 24 Apr 2022 17:26:39 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/index.js | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 25185b4bf..09652f57b 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -231,24 +231,6 @@ function initLabelEdit() { }); } -function updateIssuesMeta_new(url, action, issueIds, elementId, isAdd,ref_b) { - return new Promise((resolve) => { - $.ajax({ - type: 'POST', - url, - data: { - _csrf: csrf, - action, - issue_ids: issueIds, - id: elementId, - is_add: isAdd, - ref: ref_b, - }, - success: resolve - }); - }); -} - function updateIssuesMeta(url, action, issueIds, elementId,isAdd) { return new Promise((resolve) => { $.ajax({ @@ -546,12 +528,7 @@ function initCommentForm() { .removeClass('invisible'); $(this).data('is-checked', 'add'); } - console.log("$(this)",$(this)) - console.log("$listMenu",$listMenu) - //const isRef = ''; - // if ($listMenu.data('update-url').includes("ref")){ - // isRef = $(this).data('data-name'); - // } + updateIssuesMeta( $listMenu.data('update-url'), '', @@ -683,18 +660,17 @@ function initCommentForm() { $(this).addClass('selected active'); if (hasUpdateAction) { - let ref = '' - if (select_id=='.select-branch'){ - ref = $(this).data('name'); - } + //let ref = '' + //if (select_id=='.select-branch'){ + // ref = $(this).data('name'); + // } - updateIssuesMeta_new( + updateIssuesMeta( $menu.data('update-url'), '', $menu.data('issue-id'), $(this).data('id'), $(this).data('is-checked'), - ref ).then(reload); } switch (input_id) { From 8cb22839149a4e8f2fe7897a0f04548f47aed0ba Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Sun, 24 Apr 2022 17:38:50 +0800 Subject: [PATCH 09/16] #1821 update --- routers/repo/issue.go | 10 ++++++++-- routers/routes/routes.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 875c02024..d28936594 100755 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1304,17 +1304,23 @@ func UpdateIssueContent(ctx *context.Context) { // UpdateIssueRef change issue's code reference func UpdateIssueRef(ctx *context.Context) { - issue := GetActionIssue(ctx) + issues := getActionIssues(ctx) if ctx.Written() { return } + issue := issues[0] + if issue == nil { + log.Error("UpdateIssueRef param error ") + return + } + if !ctx.IsSigned || (ctx.User.ID != issue.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)) { ctx.Error(403) return } - ref := ctx.Query("ref") + ref := ctx.Query("id") if err := issue_service.ChangeRef(issue, ctx.User, ref); err != nil { ctx.ServerError("ChangeRef", err) return diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 7af42867c..bb57637d7 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -868,7 +868,6 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/:index", func() { m.Post("/title", repo.UpdateIssueTitle) m.Post("/content", repo.UpdateIssueContent) - m.Post("/ref", repo.UpdateIssueRef) m.Post("/watch", repo.IssueWatch) m.Group("/dependency", func() { m.Post("/add", repo.AddDependency) @@ -891,6 +890,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/labels", reqRepoIssuesOrPullsWriter, repo.UpdateIssueLabel) m.Post("/milestone", reqRepoIssuesOrPullsWriter, repo.UpdateIssueMilestone) m.Post("/assignee", reqRepoIssuesOrPullsWriter, repo.UpdateIssueAssignee) + m.Post("/ref", reqRepoIssuesOrPullsWriter, repo.UpdateIssueRef) m.Post("/request_review", reqRepoIssuesOrPullsReader, repo.UpdatePullReviewRequest) m.Post("/status", reqRepoIssuesOrPullsWriter, repo.UpdateIssueStatus) m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation) From 551104e47f705611f64cdf7afedf73c022607975 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 25 Apr 2022 09:24:30 +0800 Subject: [PATCH 10/16] #1821 fix bug --- models/issue_comment.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issue_comment.go b/models/issue_comment.go index ec9441bde..8197eba85 100755 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -48,8 +48,6 @@ const ( CommentTypePullRef // Labels changed CommentTypeLabel - // Ref changed - CommentTypeRef // Milestone changed CommentTypeMilestone // Assignees changed @@ -92,6 +90,8 @@ const ( CommentTypeReviewRequest // merge pull request CommentTypeMergePull + // Ref changed + CommentTypeRef ) // CommentTag defines comment tag type From bb048253203907594f1c2a755498e9ad0e5cb18d Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 25 Apr 2022 10:42:17 +0800 Subject: [PATCH 11/16] #1821 add function for ref handle --- modules/templates/helper.go | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 006a1e046..6f0690509 100755 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -40,6 +40,14 @@ import ( "github.com/editorconfig/editorconfig-core-go/v2" ) +const ( + REF_HEADS_PREFIX = "refs/heads/" + REF_TAGS_PREFIX = "refs/tags/" + REF_TYPE_BRANCH = "branch" + REF_TYPE_TAG = "tag" + REF_TYPE_PATTERN = "(refs/heads/|refs/tags/)" +) + // Used from static.go && dynamic.go var mailSubjectSplit = regexp.MustCompile(`(?m)^-{3,}[\s]*$`) @@ -427,6 +435,8 @@ func NewTextFuncMap() []texttmpl.FuncMap { } return float32(n) * 100 / float32(sum) }, + "GetRefType": GetRefType, + "GetRefName": GetRefName, }} } @@ -444,10 +454,12 @@ func SafeJS(raw string) template.JS { func Str2html(raw string) template.HTML { return template.HTML(markup.Sanitize(raw)) } + // -func subOne(length int)int{ - return length-1 +func subOne(length int) int { + return length - 1 } + // Escape escapes a HTML string func Escape(raw string) string { return html.EscapeString(raw) @@ -758,3 +770,18 @@ func licenses() []string { func tasks() []string { return []string{"machine_translation", "question_answering_system", "information_retrieval", "knowledge_graph", "text_annotation", "text_categorization", "emotion_analysis", "language_modeling", "speech_recognition", "automatic_digest", "information_extraction", "description_generation", "image_classification", "face_recognition", "image_search", "target_detection", "image_description_generation", "vehicle_license_plate_recognition", "medical_image_analysis", "unmanned", "unmanned_security", "drone", "vr_ar", "2_d_vision", "2.5_d_vision", "3_d_reconstruction", "image_processing", "video_processing", "visual_input_system", "speech_coding", "speech_enhancement", "speech_synthesis"} } + +func GetRefType(ref string) string { + if strings.HasPrefix(ref, REF_HEADS_PREFIX) { + return REF_TYPE_BRANCH + } + if strings.HasPrefix(ref, REF_TAGS_PREFIX) { + return REF_TYPE_TAG + } + return "" +} + +func GetRefName(ref string) string { + reg := regexp.MustCompile(REF_TYPE_PATTERN) + return reg.ReplaceAllString(ref, "") +} From 75863d0eb22b6bd68a327e389db8311b27c57799 Mon Sep 17 00:00:00 2001 From: wangjr Date: Mon, 25 Apr 2022 11:01:55 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options/locale/locale_en-US.ini | 8 ++++++++ options/locale/locale_zh-CN.ini | 8 ++++++++ templates/repo/issue/view_content/comments.tmpl | 23 +++++++++++++++++++++++ templates/repo/issue/view_content/sidebar.tmpl | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 14d4e19d1..9e92d6084 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1324,6 +1324,7 @@ issues.new.labels = Labels issues.new.add_labels_title = Apply labels issues.new.no_label = No Label issues.new.clear_labels = Clear labels +issues.new.clear_branch_tag = Clear branch or tag issues.new.no_items = No items issues.new.milestone = Milestone issues.new.add_milestone_title = Set milestone @@ -1353,6 +1354,13 @@ issues.remove_label_at = removed the
+ {{svg "octicon-milestone" 16}} + + + + + {{.Poster.GetDisplayName}} + {{if .OldRef }} + {{if .NewRef }} + {{$.i18n.Tr "repo.issues.change_branch_tag_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.remove_branch_at" (.OldRef|Escape) $createdStr | Safe}} + {{end}} + {{else}} + {{if .NewRef}} + {{ $getRefType:= GetRefType .NewRef }} + {{$getRefType}} + {{$.i18n.Tr "repo.issues.add_branch_at" (.NewRef|Escape) $createdStr | Safe}} + {{end}} + {{end}} + +
{{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index a08656702..19022020a 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -14,7 +14,7 @@
-
{{.i18n.Tr "repo.issues.new.clear_labels"}}
+
{{.i18n.Tr "repo.issues.new.clear_branch_tag"}}
From a35bb8ff8b8dfcf4e79ee8f4f98381cd26c2ed98 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 25 Apr 2022 11:11:53 +0800 Subject: [PATCH 13/16] #1821 fix bug --- modules/templates/helper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 6f0690509..dbb9354aa 100755 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -325,6 +325,8 @@ func NewFuncMap() []template.FuncMap { "DatasetPathJoin": func(arr []string, index int, seq string) string { return strings.Join(arr[1:index+1], seq) }, + "GetRefType": GetRefType, + "GetRefName": GetRefName, }} } @@ -435,8 +437,6 @@ func NewTextFuncMap() []texttmpl.FuncMap { } return float32(n) * 100 / float32(sum) }, - "GetRefType": GetRefType, - "GetRefName": GetRefName, }} } From e7965694dd547ab676383afa72604598c6aa8d0c Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 25 Apr 2022 11:31:31 +0800 Subject: [PATCH 14/16] #1821 fix bug --- models/issue.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/issue.go b/models/issue.go index 3a7097977..3ed49ce42 100755 --- a/models/issue.go +++ b/models/issue.go @@ -779,6 +779,9 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { func (issue *Issue) ChangeRef(doer *User, newRef string) (err error) { oldRef := issue.Ref issue.Ref = newRef + if oldRef == newRef { + return nil + } sess := x.NewSession() defer sess.Close() From 1f4b553fbf81e552d5ad66d6eb10cb872c873579 Mon Sep 17 00:00:00 2001 From: wangjr Date: Mon, 25 Apr 2022 11:31:50 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/issue/view_content/comments.tmpl | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 34adc8e21..c19eb030e 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -602,17 +602,29 @@ {{.Poster.GetDisplayName}} + + {{ $refOldName:= GetRefName .OldRef }} + {{ $refNewName:= GetRefName .NewRef }} + {{if .OldRef }} {{if .NewRef }} - {{$.i18n.Tr "repo.issues.change_branch_tag_at" (.OldRef|Escape) (.NewRef|Escape) $createdStr | Safe}} + {{$.i18n.Tr "repo.issues.change_branch_tag_at" ($refOldName|Escape) ($refOldName|Escape) $createdStr | Safe}} {{else}} - {{$.i18n.Tr "repo.issues.remove_branch_at" (.OldRef|Escape) $createdStr | Safe}} + {{ $getRefOldType:= GetRefType .OldRef }} + {{ if eq $getRefOldType "branch"}} + {{$.i18n.Tr "repo.issues.remove_branch_at" ($refOldName|Escape) $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.remove_tag_at" ($refOldName|Escape) $createdStr | Safe}} + {{end}} {{end}} {{else}} {{if .NewRef}} - {{ $getRefType:= GetRefType .NewRef }} - {{$getRefType}} - {{$.i18n.Tr "repo.issues.add_branch_at" (.NewRef|Escape) $createdStr | Safe}} + {{ $getRefNewType:= GetRefType .NewRef }} + {{ if eq $getRefNewType "branch"}} + {{$.i18n.Tr "repo.issues.add_branch_at" ($refNewName|Escape) $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.add_tag_at" ($refNewName|Escape) $createdStr | Safe}} + {{end}} {{end}} {{end}} From 74aab140b9f95bf2446e021624bbe6f9a7e92b67 Mon Sep 17 00:00:00 2001 From: wangjr Date: Mon, 25 Apr 2022 14:14:10 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/repo/issue/view_content/comments.tmpl | 58 ++++++++++++------------- templates/repo/issue/view_content/sidebar.tmpl | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c19eb030e..796054005 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -594,40 +594,40 @@ {{end}}
- {{else}} -
- {{svg "octicon-milestone" 16}} - - - - - {{.Poster.GetDisplayName}} + {{else if eq .Type 29}} +
+ {{svg "octicon-git-branch" 16}} + + + + + {{.Poster.GetDisplayName}} - {{ $refOldName:= GetRefName .OldRef }} - {{ $refNewName:= GetRefName .NewRef }} + {{ $refOldName:= GetRefName .OldRef }} + {{ $refNewName:= GetRefName .NewRef }} - {{if .OldRef }} - {{if .NewRef }} - {{$.i18n.Tr "repo.issues.change_branch_tag_at" ($refOldName|Escape) ($refOldName|Escape) $createdStr | Safe}} - {{else}} - {{ $getRefOldType:= GetRefType .OldRef }} - {{ if eq $getRefOldType "branch"}} - {{$.i18n.Tr "repo.issues.remove_branch_at" ($refOldName|Escape) $createdStr | Safe}} + {{if .OldRef }} + {{if .NewRef }} + {{$.i18n.Tr "repo.issues.change_branch_tag_at" ($refOldName|Escape) ($refNewName|Escape) $createdStr | Safe}} {{else}} - {{$.i18n.Tr "repo.issues.remove_tag_at" ($refOldName|Escape) $createdStr | Safe}} + {{ $getRefOldType:= GetRefType .OldRef }} + {{ if eq $getRefOldType "branch"}} + {{$.i18n.Tr "repo.issues.remove_branch_at" ($refOldName|Escape) $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.remove_tag_at" ($refOldName|Escape) $createdStr | Safe}} + {{end}} {{end}} - {{end}} - {{else}} - {{if .NewRef}} - {{ $getRefNewType:= GetRefType .NewRef }} - {{ if eq $getRefNewType "branch"}} - {{$.i18n.Tr "repo.issues.add_branch_at" ($refNewName|Escape) $createdStr | Safe}} - {{else}} - {{$.i18n.Tr "repo.issues.add_tag_at" ($refNewName|Escape) $createdStr | Safe}} + {{else}} + {{if .NewRef}} + {{ $getRefNewType:= GetRefType .NewRef }} + {{ if eq $getRefNewType "branch"}} + {{$.i18n.Tr "repo.issues.add_branch_at" ($refNewName|Escape) $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.add_tag_at" ($refNewName|Escape) $createdStr | Safe}} + {{end}} {{end}} {{end}} - {{end}} - -
+ +
{{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 19022020a..e6a61a567 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -3,7 +3,7 @@ {{if and (not .Issue.IsPull) (not .PageIsComparePull)}} -
+
{{if .Issue.Ref}}{{$.RefEndName}}{{else}}{{.i18n.Tr "repo.issues.no_ref"}}{{end}}