rename var

Author: wxiaoguang

models/issues/comment.go

@@ -182,30 +182,31 @@ func (t CommentType) HasAttachmentSupport() bool {
 	return false
 }
 
-type Role string
+// RoleInRepo presents the user's participation in the repo
+type RoleInRepo string
 
-// RoleDescriptor defines comment tag type
+// RoleDescriptor defines comment "role" tags
 type RoleDescriptor struct {
-	IsPoster bool
-	Role     Role
+	IsPoster   bool
+	RoleInRepo RoleInRepo
 }
 
 // Enumerate all the role tags.
 const (
-	RoleDescriptorOwner                Role = "owner"
-	RoleDescriptorMember               Role = "member"
-	RoleDescriptorCollaborator         Role = "collaborator"
-	RoleDescriptorFirstTimeContributor Role = "first_time_contributor"
-	RoleDescriptorContributor          Role = "contributor"
+	RoleRepoOwner                RoleInRepo = "owner"
+	RoleRepoMember               RoleInRepo = "member"
+	RoleRepoCollaborator         RoleInRepo = "collaborator"
+	RoleRepoFirstTimeContributor RoleInRepo = "first_time_contributor"
+	RoleRepoContributor          RoleInRepo = "contributor"
 )
 
 // LocaleString returns the locale string name of the Status
-func (r Role) LocaleString(lang translation.Locale) string {
+func (r RoleInRepo) LocaleString(lang translation.Locale) string {
 	return lang.Tr("repo.issues.role." + string(r))
 }
 
 // LocaleHelper returns the locale string name of the Status
-func (r Role) LocaleHelper(lang translation.Locale) string {
+func (r RoleInRepo) LocaleHelper(lang translation.Locale) string {
 	return lang.Tr("repo.issues.role." + string(r) + "_helper")
 }
 

routers/web/repo/issue.go

@@ -1228,7 +1228,7 @@ func NewIssuePost(ctx *context.Context) {
 	}
 }
 
-// roleDescriptor returns the Role Descriptor for a comment in/with the given repo, poster and issue
+// roleDescriptor returns the role descriptor for a comment in/with the given repo, poster and issue
 func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *user_model.User, issue *issues_model.Issue, hasOriginalAuthor bool) (issues_model.RoleDescriptor, error) {
 	roleDescriptor := issues_model.RoleDescriptor{}
 
@@ -1246,9 +1246,9 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 
 	// Check if the poster is owner of the repo.
 	if perm.IsOwner() {
-		// If the poster isn't a admin, enable the owner role.
+		// If the poster isn't an admin, enable the owner role.
 		if !poster.IsAdmin {
-			roleDescriptor.Role = issues_model.RoleDescriptorOwner
+			roleDescriptor.RoleInRepo = issues_model.RoleRepoOwner
 			return roleDescriptor, nil
 		}
 
@@ -1258,7 +1258,7 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 			return roleDescriptor, err
 		}
 		if ok {
-			roleDescriptor.Role = issues_model.RoleDescriptorOwner
+			roleDescriptor.RoleInRepo = issues_model.RoleRepoOwner
 			return roleDescriptor, nil
 		}
 	}
@@ -1271,7 +1271,7 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 		if isMember, err := organization.IsOrganizationMember(ctx, repo.Owner.ID, poster.ID); err != nil {
 			return roleDescriptor, err
 		} else if isMember {
-			roleDescriptor.Role = issues_model.RoleDescriptorMember
+			roleDescriptor.RoleInRepo = issues_model.RoleRepoMember
 			return roleDescriptor, nil
 		}
 	}
@@ -1280,7 +1280,7 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 	if isCollaborator, err := repo_model.IsCollaborator(ctx, repo.ID, poster.ID); err != nil {
 		return roleDescriptor, err
 	} else if isCollaborator {
-		roleDescriptor.Role = issues_model.RoleDescriptorCollaborator
+		roleDescriptor.RoleInRepo = issues_model.RoleRepoCollaborator
 		return roleDescriptor, nil
 	}
 
@@ -1298,10 +1298,10 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 	if _, total, err := issue_indexer.SearchIssues(ctx, searchOpt); err != nil {
 		return roleDescriptor, err
 	} else if total > 0 {
-		roleDescriptor.Role = issues_model.RoleDescriptorContributor
+		roleDescriptor.RoleInRepo = issues_model.RoleRepoContributor
 	} else if total == 0 && issue.IsPull && !issue.IsClosed {
 		// only display first time contributor in the first opening pull request
-		roleDescriptor.Role = issues_model.RoleDescriptorFirstTimeContributor
+		roleDescriptor.RoleInRepo = issues_model.RoleRepoFirstTimeContributor
 	}
 
 	return roleDescriptor, nil

templates/repo/issue/view_content/show_role.tmpl

@@ -3,8 +3,8 @@
 		{{ctx.Locale.Tr "repo.issues.author"}}
 	</div>
 {{end}}
-{{if .ShowRole.Role}}
-	<div class="ui basic label role-label" data-tooltip-content="{{.ShowRole.Role.LocaleHelper ctx.Locale}}">
-		{{.ShowRole.Role.LocaleString ctx.Locale}}
+{{if .ShowRole.RoleInRepo}}
+	<div class="ui basic label role-label" data-tooltip-content="{{.ShowRole.RoleInRepo.LocaleHelper ctx.Locale}}">
+		{{.ShowRole.RoleInRepo.LocaleString ctx.Locale}}
 	</div>
 {{end}}