fix bug

models/repo_permission.go

@@ -42,12 +42,12 @@ func (p *Permission) UnitAccessMode(unitType UnitType) AccessMode {
  return p.UnitsMode[unitType]
 }
 
-// CanAccess returns true if user has read access to the unit of the repository
+// CanAccess returns true if user has mode access to the unit of the repository
 func (p *Permission) CanAccess(mode AccessMode, unitType UnitType) bool {
  return p.UnitAccessMode(unitType) >= mode
 }
 
-// CanAccessAny returns true if user has read access to any of the units of the repository
+// CanAccessAny returns true if user has mode access to any of the units of the repository
 func (p *Permission) CanAccessAny(mode AccessMode, unitTypes ...UnitType) bool {
  for _, u := range unitTypes {
  if p.CanAccess(mode, u) {
@@ -62,6 +62,20 @@ func (p *Permission) CanRead(unitType UnitType) bool {
  return p.CanAccess(AccessModeRead, unitType)
 }
 
+// CanReadAny returns true if user has read access to any of the units of the repository
+func (p *Permission) CanReadAny(unitTypes ...UnitType) bool {
+ return p.CanAccessAny(AccessModeRead, unitTypes...)
+}
+
+// CanReadIssuesOrPulls returns true if isPull is true and user could read pull requests and
+// returns true if isPull is false and user could read to issues
+func (p *Permission) CanReadIssuesOrPulls(isPull bool) bool {
+ if isPull {
+ return p.CanRead(UnitTypePullRequests)
+ }
+ return p.CanRead(UnitTypeIssues)
+}
+
 // CanWrite returns true if user could write to this unit
 func (p *Permission) CanWrite(unitType UnitType) bool {
  return p.CanAccess(AccessModeWrite, unitType)
@@ -76,15 +90,6 @@ func (p *Permission) CanWriteIssuesOrPulls(isPull bool) bool {
  return p.CanWrite(UnitTypeIssues)
 }
 
-// CanReadIssuesOrPulls returns true if isPull is true and user could read pull requests and
-// returns true if isPull is false and user could read to issues
-func (p *Permission) CanReadIssuesOrPulls(isPull bool) bool {
- if isPull {
- return p.CanRead(UnitTypePullRequests)
- }
- return p.CanRead(UnitTypeIssues)
-}
-
 // GetUserRepoPermission returns the user permissions to the repository
 func GetUserRepoPermission(repo *Repository, user *User) (Permission, error) {
  return getUserRepoPermission(x, repo, user)

templates/repo/activity.tmpl

@@ -23,10 +23,10 @@
  </h2>
  <div class="ui divider"></div>
 
- {{if (or (.Permission.CanAccess $.UnitTypeIssues) (.Permission.CanAccess $.UnitTypePullRequests))}}
+ {{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
  <h4 class="ui top attached header">{{.i18n.Tr "repo.activity.overview"}}</h4>
  <div class="ui attached segment two column grid">
- {{if .Permission.CanAccess $.UnitTypePullRequests}}
+ {{if .Permission.CanRead $.UnitTypePullRequests}}
  <div class="column">
  {{if gt .Activity.ActivePRCount 0}}
  <div class="stats-table">
@@ -41,7 +41,7 @@
  {{.i18n.Tr (TrN .i18n.Lang .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n") .Activity.ActivePRCount | Safe }}
  </div>
  {{end}}
- {{if .Permission.CanAccess $.UnitTypeIssues}}
+ {{if .Permission.CanRead $.UnitTypeIssues}}
  <div class="column">
  {{if gt .Activity.ActiveIssueCount 0}}
  <div class="stats-table">
@@ -58,7 +58,7 @@
  {{end}}
  </div>
  <div class="ui attached segment horizontal segments">
- {{if .Permission.CanAccess $.UnitTypePullRequests}}
+ {{if .Permission.CanRead $.UnitTypePullRequests}}
  <a href="#merged-pull-requests" class="ui attached segment text center">
  <i class="text purple octicon octicon-git-pull-request"></i> <strong>{{.Activity.MergedPRCount}}</strong><br>
  {{.i18n.Tr (TrN .i18n.Lang .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n") }}
@@ -68,7 +68,7 @@
  {{.i18n.Tr (TrN .i18n.Lang .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n") }}
  </a>
  {{end}}
- {{if .Permission.CanAccess $.UnitTypeIssues}}
+ {{if .Permission.CanRead $.UnitTypeIssues}}
  <a href="#closed-issues" class="ui attached segment text center">
  <i class="text red octicon octicon-issue-closed"></i> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
  {{.i18n.Tr (TrN .i18n.Lang .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n") }}

templates/repo/header.tmpl

@@ -30,7 +30,7 @@
  {{.NumStars}}
  </a>
  </div>
- {{if and (not .IsBare) ($.Permission.CanAccess $.UnitTypeCode)}}
+ {{if and (not .IsBare) ($.Permission.CanRead $.UnitTypeCode)}}
  <div class="ui compact labeled button" tabindex="0">
  <a class="ui compact button {{if not $.CanSignedUserFork}}poping up{{end}}" {{if $.CanSignedUserFork}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else if $.IsSigned}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
  <i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}}
@@ -47,43 +47,43 @@
 {{if not .IsDiffCompare}}
  <div class="ui tabs container">
  <div class="ui tabular stackable menu navbar">
- {{if .Permission.CanAccess $.UnitTypeCode}}
+ {{if .Permission.CanRead $.UnitTypeCode}}
  <a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
  <i class="octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
  </a>
  {{end}}
 
- {{if .Permission.CanAccess $.UnitTypeIssues}}
+ {{if .Permission.CanRead $.UnitTypeIssues}}
  <a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
  <i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
  </a>
  {{end}}
 
- {{if .Permission.CanAccess $.UnitTypeExternalTracker}}
+ {{if .Permission.CanRead $.UnitTypeExternalTracker}}
  <a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues" target="_blank" rel="noopener noreferrer">
  <i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} </span>
  </a>
  {{end}}
 
- {{if and .Repository.CanEnablePulls (.Permission.CanAccess $.UnitTypePullRequests)}}
+ {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}}
  <a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
  <i class="octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui {{if not .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
  </a>
  {{end}}
 
- {{if and (.Permission.CanAccess $.UnitTypeReleases) (not .IsBareRepo) }}
+ {{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsBareRepo) }}
  <a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
  <i class="octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .Repository.NumReleases}}gray{{else}}blue{{end}} small label">{{.Repository.NumReleases}}</span>
  </a>
  {{end}}
 
- {{if or (.Permission.CanAccess $.UnitTypeWiki) (.Permission.CanAccess $.UnitTypeExternalWiki)}}
- <a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanAccess $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
+ {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}}
+ <a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
  <i class="octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}}
  </a>
  {{end}}
 
- {{if and (.Permission.CanAccessAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsBareRepo)}}
+ {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsBareRepo)}}
  <a class="{{if .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}/activity">
  <i class="octicon octicon-pulse"></i> {{.i18n.Tr "repo.activity"}}
  </a>

templates/repo/release/list.tmpl

@@ -41,7 +41,7 @@
  <a href="{{$.RepoLink}}/src/tag/{{.TagName | EscapePound}}" rel=""><i class="tag icon"></i> {{.TagName}}</a>
  </h4>
  <div class="download">
- {{if $.Permission.CanAccess $.UnitTypeCode}}
+ {{if $.Permission.CanRead $.UnitTypeCode}}
  <a href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel=""><i class="code icon"></i> {{ShortSha .Sha1}}</a>
  <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel=""><i class="octicon octicon-file-zip"></i> ZIP</a>
  <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.tar.gz"><i class="octicon octicon-file-zip"></i> TAR.GZ</a>
@@ -66,7 +66,7 @@
  <div class="download">
  <h2>{{$.i18n.Tr "repo.release.downloads"}}</h2>
  <ul class="list">
- {{if $.Permission.CanAccess $.UnitTypeCode}}
+ {{if $.Permission.CanRead $.UnitTypeCode}}
  <li>
  <a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel=""><strong><i class="octicon octicon-file-zip"></i> {{$.i18n.Tr "repo.release.source_code"}} (ZIP)</strong></a>
  </li>

templates/repo/settings/options.tmpl

@@ -294,7 +294,7 @@
  </div>
  </div>
 
- {{if .Permission.CanAccess $.UnitTypeWiki}}
+ {{if .Permission.CanRead $.UnitTypeWiki}}
  <div class="ui divider"></div>
 
  <div class="item">

templates/repo/sub_menu.tmpl

@@ -1,11 +1,11 @@
 <div class="ui segment sub-menu">
  <div class="ui two horizontal center link list">
- {{if and (.Permission.CanAccess $.UnitTypeCode) (not .IsBareRepo)}}
+ {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsBareRepo)}}
  <div class="item{{if .PageIsCommits}} active{{end}}">
  <a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a>
  </div>
  {{end}}
- {{if and (.Permission.CanAccess $.UnitTypeCode) (not .IsBareRepo) }}
+ {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsBareRepo) }}
  <div class="item{{if .PageIsBranches}} active{{end}}">
  <a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a>
  </div>