From c753fdceaf0549aa865cff4e1f42be5d907bbdb1 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 22 Feb 2015 03:07:04 -0500 Subject: [PATCH] templates/org/home.tmpl: fix org member can't see public repo --- gogs.go | 2 +- templates/.VERSION | 2 +- templates/org/home.tmpl | 140 ++++++++++++++++++++-------------------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/gogs.go b/gogs.go index 5c24e229a1..b2366b6341 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.5.14.0221 Beta" +const APP_VER = "0.5.14.0222 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/templates/.VERSION b/templates/.VERSION index 489addf9a7..b9cd4a186a 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.14.0221 Beta \ No newline at end of file +0.5.14.0222 Beta \ No newline at end of file diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index bb160b57ba..df29d61fc4 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -9,85 +9,85 @@ {{if .IsOrganizationOwner}}{{end}} {{if .Org.Description}}

{{.Org.Description}}

{{end}} - +
{{$isMember := .Org.IsOrgMember $.SignedUser.Id}} -
-
- {{if .IsOrganizationOwner}} - {{.i18n.Tr "new_repo"}} - {{end}} -
-
- {{range .Repos}} - {{if .HasAccess $.SignedUser.Name}} -
-
    -
  • {{.NumStars}}
  • -
  • {{.NumForks}}
  • -
-

{{.Name}}

-

{{.Description}}

-

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}

-
- {{end}} +
+
+ {{if .IsOrganizationOwner}} + {{.i18n.Tr "new_repo"}} + {{end}} +
+
+ {{range .Repos}} + {{if or (not .IsPrivate) (.HasAccess $.SignedUser.Name)}} +
+
    +
  • {{.NumStars}}
  • +
  • {{.NumForks}}
  • +
+

{{.Name}}

+

{{.Description}}

+

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}

+
{{end}} -
+ {{end}}
-
-
-
-
- {{if $isMember}} - {{.Org.NumMembers}} - {{end}} - {{.i18n.Tr "org.people"}} -
-
- {{range .Members}} +
+
+
+
+
+ {{if $isMember}} + {{.Org.NumMembers}} + {{end}} + {{.i18n.Tr "org.people"}} +
+
+ {{range .Members}} {{if or $isMember (.IsPublicMember $.Org.Id)}} - - {{end}} + {{end}} -
- {{if .IsOrganizationOwner}} - - {{end}} -
- {{if $isMember}} -
-
-
- {{.Org.NumTeams}} - {{.i18n.Tr "org.teams"}} -
-
-
    - {{range .Teams}} -
  • - {{.Name}} -

    {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

    -
  • - {{end}} -
-
- {{if .IsOrganizationOwner}} - - {{end}} -
- {{end}} + {{end}} +
+ {{if .IsOrganizationOwner}} + + {{end}}
-
+ {{if $isMember}} +
+
+
+ {{.Org.NumTeams}} + {{.i18n.Tr "org.teams"}} +
+
+
    + {{range .Teams}} +
  • + {{.Name}} +

    {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

    +
  • + {{end}} +
+
+ {{if .IsOrganizationOwner}} + + {{end}} +
+ {{end}} +
+
{{template "ng/base/footer" .}} \ No newline at end of file