diff options
| author | Rajat Jain <rjain@gitlab.com> | 2019-04-15 12:58:30 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-15 12:58:30 +0300 |
| commit | b5ab1d91e377787e0711effebce073af76becc56 (patch) | |
| tree | 3282fbee428f5948302eb622466f5527b01c9117 /app/views/shared | |
| parent | d83eb63beef28a6229b4bf851ee34c51938e29c7 (diff) | |
Display scoped labels in Issue Boards
This change brings new Scoped labels to Issue board as well.
With the last change, this was missed.
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/boards/components/sidebar/_labels.html.haml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/views/shared/boards/components/sidebar/_labels.html.haml b/app/views/shared/boards/components/sidebar/_labels.html.haml index 47cc912a9a1..311dc69d213 100644 --- a/app/views/shared/boards/components/sidebar/_labels.html.haml +++ b/app/views/shared/boards/components/sidebar/_labels.html.haml @@ -7,10 +7,17 @@ .value.issuable-show-labels.dont-hide %span.no-value{ "v-if" => "issue.labels && issue.labels.length === 0" } = _("None") - %a{ href: "#", - "v-for" => "label in issue.labels" } - .badge.color-label.has-tooltip{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" } - {{ label.title }} + %span{ "v-for" => "label in issue.labels" } + %span.d-inline-block.position-relative.scoped-label-wrapper{ "v-if" => "showScopedLabels(label)" } + %a{ href: '#' } + %span.badge.color-label.label{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" } + {{ label.title }} + %a.label.scoped-label{ ":href" => "helpLink()" } + %i.fa.fa-question-circle{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" } + %a{ href: "#", "v-else" => true } + .badge.color-label.has-tooltip{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" } + {{ label.title }} + - if can_admin_issue? .selectbox %input{ type: "hidden", |