From c1be811954b65350fc4319fc7f537ce4ed60980f Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 2 Nov 2021 16:52:32 +0800 Subject: [PATCH 1/6] fix issue #497 --- templates/repo/view_file.tmpl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 1216b5f40..7c98420d9 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -34,6 +34,21 @@ {{end}} + + {{if .ReadmeInList}} +
+
+ {{if .Repository.CanEnableEditor}} + {{if .CanEditFile}} + {{svg "octicon-pencil" 16}} + {{else}} + {{svg "octicon-pencil" 16}} + {{end}} + {{end}} +
+
+ {{end}} + {{if not .ReadmeInList}}
From ad2831e81a653e3cc554281eb45d5569262adc05 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 2 Nov 2021 17:45:29 +0800 Subject: [PATCH 2/6] fix issue --- templates/repo/view_file.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 7c98420d9..60777b5dd 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -63,7 +63,7 @@ {{.i18n.Tr "repo.file_history"}}
{{if .Repository.CanEnableEditor}} - {{if .CanEditFile}} + {{.CanEditFile}}{{if .CanEditFile}} {{svg "octicon-pencil" 16}} {{else}} {{svg "octicon-pencil" 16}} From 34bce0167af8fc4f41d7ad27490e8dee29a83b32 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 5 Nov 2021 17:43:51 +0800 Subject: [PATCH 3/6] fix issue --- templates/org/home.tmpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index a81e8ac17..ad5a8e02d 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -38,11 +38,12 @@

{{.i18n.Tr "org.people"}} - {{if .IsOrganizationMember}} -
- {{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}} -
- {{end}} +
+ {{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}} +
+ + +

{{$isMember := .IsOrganizationMember}} From 501f7f060e37035059b9284155169d6d0969e785 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 8 Nov 2021 10:21:01 +0800 Subject: [PATCH 4/6] show org members --- routers/org/members.go | 0 routers/routes/routes.go | 7 ++++++- templates/org/home.tmpl | 0 templates/org/navber.tmpl | 12 ++++++------ 4 files changed, 12 insertions(+), 7 deletions(-) mode change 100644 => 100755 routers/org/members.go mode change 100644 => 100755 templates/org/home.tmpl diff --git a/routers/org/members.go b/routers/org/members.go old mode 100644 new mode 100755 diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 7e7d0642a..46db6803c 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -616,6 +616,11 @@ func RegisterRoutes(m *macaron.Macaron) { // ***** START: Organization ***** m.Group("/org", func() { + m.Group("/:org", func() { + m.Get("/members", org.Members) + }, context.OrgAssignment()) + }) + m.Group("/org", func() { m.Group("", func() { m.Get("/create", org.Create) m.Post("/create", bindIgnErr(auth.CreateOrgForm{}), org.CreatePost) @@ -625,7 +630,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/dashboard", user.Dashboard) m.Get("/^:type(issues|pulls)$", user.Issues) m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones) - m.Get("/members", org.Members) + //m.Get("/members", org.Members) m.Post("/members/action/:action", org.MembersAction) m.Get("/teams", org.Teams) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl old mode 100644 new mode 100755 diff --git a/templates/org/navber.tmpl b/templates/org/navber.tmpl index 9ff92845e..7bb2ff69c 100755 --- a/templates/org/navber.tmpl +++ b/templates/org/navber.tmpl @@ -3,10 +3,10 @@ {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} @@ -23,10 +23,10 @@ {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} {{end}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} From e4adc070ac490ac6178c77cb4c958a5128a989e8 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 8 Nov 2021 11:19:54 +0800 Subject: [PATCH 5/6] add caneditfile --- routers/repo/view.go | 5 +++++ templates/repo/view_file.tmpl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) mode change 100644 => 100755 routers/repo/view.go mode change 100644 => 100755 templates/repo/view_file.tmpl diff --git a/routers/repo/view.go b/routers/repo/view.go old mode 100644 new mode 100755 index 9477b27dd..f85ab07cf --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -243,6 +243,11 @@ func renderDirectory(ctx *context.Context, treeLink string) { ctx.Data["ReadmeInList"] = true ctx.Data["ReadmeExist"] = true ctx.Data["FileIsSymlink"] = readmeFile.isSymlink + ctx.Data["ReadmeName"] = readmeFile.name + + if ctx.Repo.CanEnableEditor() { + ctx.Data["CanEditFile"] = true + } dataRc, err := readmeFile.blob.DataAsync() if err != nil { diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl old mode 100644 new mode 100755 index 60777b5dd..aef8e728e --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -40,7 +40,7 @@
{{if .Repository.CanEnableEditor}} {{if .CanEditFile}} - {{svg "octicon-pencil" 16}} + {{svg "octicon-pencil" 16}} {{else}} {{svg "octicon-pencil" 16}} {{end}} From 36fb3f0454fab228555eeacef889300c7e59c4c8 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 8 Nov 2021 16:31:11 +0800 Subject: [PATCH 6/6] fix issue --- templates/repo/view_file.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index aef8e728e..a0cae31f3 100755 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -63,7 +63,7 @@ {{.i18n.Tr "repo.file_history"}}
{{if .Repository.CanEnableEditor}} - {{.CanEditFile}}{{if .CanEditFile}} + {{if .CanEditFile}} {{svg "octicon-pencil" 16}} {{else}} {{svg "octicon-pencil" 16}}