From 6af2679fc175651ca686205dff881be1b8a4a8a3 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 12 Oct 2021 09:34:36 +0800 Subject: [PATCH 1/2] fix issue #327 --- templates/repo/issue/labels.tmpl | 26 +++++++++++++------- templates/repo/issue/list.tmpl | 9 +++++-- templates/repo/issue/milestone_issues.tmpl | 10 ++++++-- templates/repo/issue/milestone_new.tmpl | 28 +++++++++++++++++----- templates/repo/issue/milestones.tmpl | 27 ++++++++++++++------- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/new.tmpl | 18 +++++++++++--- templates/repo/issue/view.tmpl | 9 +++++-- 8 files changed, 97 insertions(+), 32 deletions(-) diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index d3df3b594..36683ca9b 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -2,14 +2,24 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} - {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} -
-
{{.i18n.Tr "repo.issues.new_label"}}
-
- {{end}} -
+
+
+
+ {{.i18n.Tr "repo.issues"}} +
/
+
{{.Title | RenderEmoji}}
+
+
+
+ {{template "repo/issue/navbar" .}} + {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} +
+
{{.i18n.Tr "repo.issues.new_label"}}
+
+ {{end}} +
+ +
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} {{template "repo/issue/labels/label_new" .}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index f64de74e8..a99205eea 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -3,14 +3,19 @@ {{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} +
+
+ {{.i18n.Tr "repo.issues"}} +
/
+ +
{{template "repo/issue/search" .}}
{{if not .Repository.IsArchived}}
+ {{template "repo/issue/navbar" .}} {{if .PageIsIssueList}} {{.i18n.Tr "repo.issues.new"}} {{else}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index a35dacbce..b8f68e025 100755 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -3,8 +3,14 @@ {{template "repo/header" .}}
-
-

{{.Milestone.Name}}

+
+
+ {{.i18n.Tr "repo.issues"}} +
/
+ {{.i18n.Tr "repo.milestones"}} +
/
+
{{.Milestone.Name}}
+
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index ea704c056..6f17f1b71 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -2,13 +2,29 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} - {{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}} -
- {{.i18n.Tr "repo.milestones.new"}} +
+
+
+ {{.i18n.Tr "repo.issues"}} +
/
+ {{.i18n.Tr "repo.milestones"}} +
/
+ {{if .PageIsEditMilestone}} +
{{.i18n.Tr "repo.milestones.edit"}}
+ {{else}} +
{{.i18n.Tr "repo.milestones.new"}}
+ {{end}} +
- {{end}} +
+ {{template "repo/issue/navbar" .}} + {{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}} +
+ {{.i18n.Tr "repo.milestones.new"}} +
+ {{end}} +
+

diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index bee1cee65..850402fd2 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -2,14 +2,25 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} - {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} -
- {{.i18n.Tr "repo.milestones.new"}} -
- {{end}} -
+
+
+
+ {{.i18n.Tr "repo.issues"}} +
/
+
{{.Title | RenderEmoji}}
+
+
+ {{if not .Repository.IsArchived}} +
+ {{template "repo/issue/navbar" .}} + {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} +
+ {{.i18n.Tr "repo.milestones.new"}} +
+ {{end}} +
+ {{end}} +
{{template "base/alert" .}}
diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 1e864458e..3df8e19b2 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -
+
{{.i18n.Tr "repo.labels"}} {{.i18n.Tr "repo.milestones"}}
diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl index 3c6bc05b1..398fa5e63 100644 --- a/templates/repo/issue/new.tmpl +++ b/templates/repo/issue/new.tmpl @@ -2,9 +2,21 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} -
+
+
+
+ {{.i18n.Tr "repo.issues"}} +
/
+
{{.i18n.Tr "repo.issues.new"}}
+
+
+
+ {{template "repo/issue/navbar" .}} + +
+ +
+
{{template "repo/issue/new_form" .}}
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index 6abf84cab..af4137238 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -3,11 +3,16 @@ {{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} +
+
+ {{.i18n.Tr "repo.issues"}} +
/
+
{{.Title | RenderEmoji}}
+
{{if not .Repository.IsArchived}}
+ {{template "repo/issue/navbar" .}} {{if .PageIsIssueList}} {{.i18n.Tr "repo.issues.new"}} {{else}} From 2856651aba473a9cdbcc16a3adfc881298bcd348 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Tue, 12 Oct 2021 09:46:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8C=87=E6=A0=87=E5=90=88=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/git/repo_stats_custom.go | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/git/repo_stats_custom.go b/modules/git/repo_stats_custom.go index 95f1086ad..50a740fb0 100644 --- a/modules/git/repo_stats_custom.go +++ b/modules/git/repo_stats_custom.go @@ -13,6 +13,7 @@ import ( type RepoKPIStats struct { Contributors int64 KeyContributors int64 + DevelopAge int64 ContributorsAdded int64 CommitsAdded int64 CommitLinesModified int64 @@ -66,6 +67,10 @@ func GetRepoKPIStats(repoPath string) (*RepoKPIStats, error) { } + err = setDevelopAge(repoPath, stats) + if err != nil { + return nil, fmt.Errorf("FillFromGit: %v", err) + } err = setRepoKPIStats(repoPath, fourMonthAgo, stats, newContributersDict) if err != nil { @@ -75,6 +80,27 @@ func GetRepoKPIStats(repoPath string) (*RepoKPIStats, error) { } +func setDevelopAge(repoPath string, stats *RepoKPIStats) error { + args := []string{"log", "--no-merges", "--branches=*", "--format=%cd", "--date=short"} + stdout, err := NewCommand(args...).RunInDirBytes(repoPath) + if err != nil { + return err + } + scanner := bufio.NewScanner(bytes.NewReader(stdout)) + scanner.Split(bufio.ScanLines) + developMonth := make(map[string]struct{}) + for scanner.Scan() { + l := strings.TrimSpace(scanner.Text()) + month := l[0:strings.LastIndex(l, "-")] + if _, ok := developMonth[month]; !ok { + developMonth[month] = struct{}{} + } + } + + stats.DevelopAge = int64(len(developMonth)) + return nil +} + //获取一天内的用户贡献指标 func GetUserKPIStats(repoPath string) (map[string]*UserKPIStats, error) { timeUntil := time.Now()