diff --git a/appview/pages/pages.go b/appview/pages/pages.go index a39357a9..010c4aa0 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -231,6 +231,10 @@ func (r RolesInRepo) IsOwner() bool { return slices.Contains(r.Roles, "repo:owner") } +func (r RolesInRepo) IsCollaborator() bool { + return slices.Contains(r.Roles, "repo:collaborator") +} + func (r RepoInfo) OwnerWithAt() string { if r.OwnerHandle != "" { return fmt.Sprintf("@%s", r.OwnerHandle) @@ -441,10 +445,11 @@ type Collaborator struct { } type RepoSettingsParams struct { - LoggedInUser *auth.User - RepoInfo RepoInfo - Collaborators []Collaborator - Active string + LoggedInUser *auth.User + RepoInfo RepoInfo + Collaborators []Collaborator + Active string + // TODO: use repoinfo.roles IsCollaboratorInviteAllowed bool } diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html index 0d32e09d..68e0aebd 100644 --- a/appview/pages/templates/repo/issues/issue.html +++ b/appview/pages/templates/repo/issues/issue.html @@ -101,7 +101,9 @@ {{ end }} - {{ if eq .LoggedInUser.Did .Issue.OwnerDid }} + {{ $isIssueAuthor := eq .LoggedInUser.Did .Issue.OwnerDid }} + {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }} + {{ if or $isIssueAuthor $isRepoCollaborator }} {{ $action := "close" }} {{ $icon := "circle-x" }} {{ $hoverColor := "red" }}