Use scoped label display and menu grouping also for non-exclusive labels

Author: brechtvl

models/issues/label.go

@@ -190,17 +190,22 @@ func (label *Label) UseLightTextColor() bool {
 }
 
 // Return scope substring of label name, or empty string if none exists
-func (label *Label) ExclusiveScope() string {
-	if !label.Exclusive {
-		return ""
-	}
+func (label *Label) Scope() string {
 	lastIndex := strings.LastIndex(label.Name, "/")
 	if lastIndex == -1 || lastIndex == 0 || lastIndex == len(label.Name)-1 {
 		return ""
 	}
 	return label.Name[:lastIndex]
 }
 
+// Return scope for exclusive labels, or empty string if none exists
+func (label *Label) ExclusiveScope() string {
+	if !label.Exclusive {
+		return ""
+	}
+	return label.Scope()
+}
+
 // NewLabel creates a new label
 func NewLabel(ctx context.Context, label *Label) error {
 	if !LabelColorPattern.MatchString(label.Color) {

modules/templates/helper.go

@@ -809,7 +809,7 @@ func RenderIssueTitle(ctx context.Context, text, urlPrefix string, metas map[str
 
 // RenderLabel renders a label
 func RenderLabel(label *issues_model.Label) string {
-	labelScope := label.ExclusiveScope()
+	labelScope := label.Scope()
 
 	textColor := "#111"
 	if label.UseLightTextColor() {

templates/repo/issue/labels/labels_selector_field.tmpl

@@ -19,24 +19,26 @@
 		{{end}}
 		<a class="no-select item" href="#">{{.locale.Tr "repo.issues.new.clear_labels"}}</a>
 		{{if or .Labels .OrgLabels}}
-			{{$previousExclusiveScope := "_no_scope"}}
+			{{$previousScope := "_no_scope"}}
 			{{range .Labels}}
+				{{$scope := .Scope}}
 				{{$exclusiveScope := .ExclusiveScope}}
-				{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+				{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 					<div class="ui divider"></div>
 				{{end}}
-				{{$previousExclusiveScope = $exclusiveScope}}
+				{{$previousScope = $scope}}
 				<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}</span>&nbsp;&nbsp;{{RenderLabel .}}
 				{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
 			{{end}}
 			<div class="ui divider"></div>
-			{{$previousExclusiveScope := "_no_scope"}}
+			{{$previousScope := "_no_scope"}}
 			{{range .OrgLabels}}
+				{{$scope := .Scope}}
 				{{$exclusiveScope := .ExclusiveScope}}
-				{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+				{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 					<div class="ui divider"></div>
 				{{end}}
-				{{$previousExclusiveScope = $exclusiveScope}}
+				{{$previousScope = $scope}}
 				<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}</span>&nbsp;&nbsp;{{RenderLabel .}}
 				{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a>
 			{{end}}

templates/repo/issue/list.tmpl

@@ -50,14 +50,14 @@
 							</div>
 							<span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_label_no_select"}}</a>
-							{{$previousExclusiveScope := "_no_scope"}}
+							{{$previousScope := "_no_scope"}}
 							{{range .Labels}}
-								{{$exclusiveScope := .ExclusiveScope}}
-								{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+								{{$scope := .Scope}}
+								{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 									<div class="ui divider"></div>
 								{{end}}
-								{{$previousExclusiveScope = $exclusiveScope}}
-								<a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel .}}</a>
+								{{$previousScope = $scope}}
+								<a class="item label-filter-item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.QueryString}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}" data-label-id="{{.ID}}">{{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if .ExclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel .}}</a>
 							{{end}}
 						</div>
 					</div>
@@ -224,15 +224,15 @@
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 						<div class="menu">
-							{{$previousExclusiveScope := "_no_scope"}}
+							{{$previousScope := "_no_scope"}}
 							{{range .Labels}}
-								{{$exclusiveScope := .ExclusiveScope}}
-								{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
+								{{$scope := .Scope}}
+								{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
 									<div class="ui divider"></div>
 								{{end}}
-								{{$previousExclusiveScope = $exclusiveScope}}
+								{{$previousScope = $scope}}
 								<div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
-									{{if contain $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel .}}
+									{{if contain $.SelLabelIDs .ID}}{{if .ExclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel .}}
 								</div>
 							{{end}}
 						</div>