Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
36e3cda0
Commit
36e3cda0
authored
Nov 09, 2020
by
Eulyeon Ko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use scoped-labels-available over scoped-labels
Per BE reviewer suggestion.
parent
f897db6b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/issues_list/components/issuable.vue
app/assets/javascripts/issues_list/components/issuable.vue
+2
-2
app/assets/javascripts/issues_list/index.js
app/assets/javascripts/issues_list/index.js
+2
-2
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-1
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/_issues.html.haml
+1
-1
ee/app/views/projects/integrations/jira/issues/index.html.haml
...p/views/projects/integrations/jira/issues/index.html.haml
+1
-1
spec/frontend/issues_list/components/issuable_spec.js
spec/frontend/issues_list/components/issuable_spec.js
+2
-2
No files found.
app/assets/javascripts/issues_list/components/issuable.vue
View file @
36e3cda0
...
@@ -37,7 +37,7 @@ export default {
...
@@ -37,7 +37,7 @@ export default {
openedAgoJira
:
__
(
'
opened %{timeAgoString} by %{user} in Jira
'
),
openedAgoJira
:
__
(
'
opened %{timeAgoString} by %{user} in Jira
'
),
},
},
inject
:
{
inject
:
{
scopedLabels
:
[
'
scopedLabels
'
],
scopedLabels
Available
:
[
'
scopedLabelsAvailable
'
],
},
},
components
:
{
components
:
{
IssueAssignees
,
IssueAssignees
,
...
@@ -219,7 +219,7 @@ export default {
...
@@ -219,7 +219,7 @@ export default {
return
mergeUrlParams
(
params
,
this
.
baseUrl
);
return
mergeUrlParams
(
params
,
this
.
baseUrl
);
},
},
isScoped
({
name
})
{
isScoped
({
name
})
{
return
isScopedLabel
({
title
:
name
})
&&
this
.
scopedLabels
;
return
isScopedLabel
({
title
:
name
})
&&
this
.
scopedLabels
Available
;
},
},
labelHref
({
name
})
{
labelHref
({
name
})
{
if
(
this
.
isJiraIssue
)
{
if
(
this
.
isJiraIssue
)
{
...
...
app/assets/javascripts/issues_list/index.js
View file @
36e3cda0
...
@@ -41,12 +41,12 @@ function mountIssuablesListApp() {
...
@@ -41,12 +41,12 @@ function mountIssuablesListApp() {
}
}
document
.
querySelectorAll
(
'
.js-issuables-list
'
).
forEach
(
el
=>
{
document
.
querySelectorAll
(
'
.js-issuables-list
'
).
forEach
(
el
=>
{
const
{
canBulkEdit
,
emptyStateMeta
=
{},
scopedLabels
,
...
data
}
=
el
.
dataset
;
const
{
canBulkEdit
,
emptyStateMeta
=
{},
scopedLabels
Available
,
...
data
}
=
el
.
dataset
;
return
new
Vue
({
return
new
Vue
({
el
,
el
,
provide
:
{
provide
:
{
scopedLabels
:
parseBoolean
(
scopedLabels
),
scopedLabels
Available
:
parseBoolean
(
scopedLabelsAvailable
),
},
},
render
(
createElement
)
{
render
(
createElement
)
{
return
createElement
(
IssuablesListApp
,
{
return
createElement
(
IssuablesListApp
,
{
...
...
app/views/groups/issues.html.haml
View file @
36e3cda0
...
@@ -31,6 +31,6 @@
...
@@ -31,6 +31,6 @@
'empty-state-meta'
:
{
svg_path:
image_path
(
'illustrations/issues.svg'
)
},
'empty-state-meta'
:
{
svg_path:
image_path
(
'illustrations/issues.svg'
)
},
'sort-key'
:
@sort
,
'sort-key'
:
@sort
,
type:
'issues'
,
type:
'issues'
,
'scoped-labels'
:
scoped_labels_available?
(
@group
).
to_json
}
}
'scoped-labels
-available
'
:
scoped_labels_available?
(
@group
).
to_json
}
}
-
else
-
else
=
render
'shared/issues'
=
render
'shared/issues'
app/views/projects/issues/_issues.html.haml
View file @
36e3cda0
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
'can-bulk-edit'
:
@can_bulk_update
.
to_json
,
'can-bulk-edit'
:
@can_bulk_update
.
to_json
,
'sort-key'
:
@sort
,
'sort-key'
:
@sort
,
type:
type
,
type:
type
,
'scoped-labels'
:
scoped_labels_available?
(
@project
).
to_json
}
}
'scoped-labels
-available
'
:
scoped_labels_available?
(
@project
).
to_json
}
}
-
else
-
else
-
empty_state_path
=
local_assigns
.
fetch
(
:empty_state_path
,
'shared/empty_states/issues'
)
-
empty_state_path
=
local_assigns
.
fetch
(
:empty_state_path
,
'shared/empty_states/issues'
)
%ul
.content-list.issues-list.issuable-list
{
class:
(
"manual-ordering"
if
@sort
==
'relative_position'
)
}
%ul
.content-list.issues-list.issuable-list
{
class:
(
"manual-ordering"
if
@sort
==
'relative_position'
)
}
...
...
ee/app/views/projects/integrations/jira/issues/index.html.haml
View file @
36e3cda0
...
@@ -20,4 +20,4 @@
...
@@ -20,4 +20,4 @@
'sort-key'
:
@sort
,
'sort-key'
:
@sort
,
type:
'jira'
,
type:
'jira'
,
'project-path'
:
@project
.
full_path
,
'project-path'
:
@project
.
full_path
,
'scoped-labels'
:
scoped_labels_available?
(
@project
).
to_json
}
}
'scoped-labels
-available
'
:
scoped_labels_available?
(
@project
).
to_json
}
}
spec/frontend/issues_list/components/issuable_spec.js
View file @
36e3cda0
...
@@ -38,7 +38,7 @@ describe('Issuable component', () => {
...
@@ -38,7 +38,7 @@ describe('Issuable component', () => {
let
DateOrig
;
let
DateOrig
;
let
wrapper
;
let
wrapper
;
const
factory
=
(
props
=
{},
scopedLabels
=
false
)
=>
{
const
factory
=
(
props
=
{},
scopedLabels
Available
=
false
)
=>
{
wrapper
=
shallowMount
(
Issuable
,
{
wrapper
=
shallowMount
(
Issuable
,
{
propsData
:
{
propsData
:
{
issuable
:
simpleIssue
,
issuable
:
simpleIssue
,
...
@@ -46,7 +46,7 @@ describe('Issuable component', () => {
...
@@ -46,7 +46,7 @@ describe('Issuable component', () => {
...
props
,
...
props
,
},
},
provide
:
{
provide
:
{
scopedLabels
,
scopedLabels
Available
,
},
},
stubs
:
{
stubs
:
{
'
gl-sprintf
'
:
GlSprintf
,
'
gl-sprintf
'
:
GlSprintf
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment