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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
fae42270
Commit
fae42270
authored
Jun 28, 2018
by
Luke Bennett
Committed by
Phil Hughes
Jun 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "No UI element to edit group label"
parent
e28896ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
4 deletions
+23
-4
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+6
-4
spec/features/groups/labels/index_spec.rb
spec/features/groups/labels/index_spec.rb
+17
-0
No files found.
app/views/shared/_label.html.haml
View file @
fae42270
...
@@ -21,8 +21,9 @@
...
@@ -21,8 +21,9 @@
=
sprite_icon
(
'star-o'
)
=
sprite_icon
(
'star-o'
)
%button
.label-action.remove-priority.btn.btn-transparent.has-tooltip
{
title:
_
(
'Remove priority'
),
type:
'button'
,
data:
{
placement:
'top'
},
aria_label:
_
(
'Deprioritize label'
)
}
%button
.label-action.remove-priority.btn.btn-transparent.has-tooltip
{
title:
_
(
'Remove priority'
),
type:
'button'
,
data:
{
placement:
'top'
},
aria_label:
_
(
'Deprioritize label'
)
}
=
sprite_icon
(
'star'
)
=
sprite_icon
(
'star'
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
%li
.inline
%li
.inline
=
link_to
edit_label_path
(
label
),
class:
'btn btn-transparent label-action'
,
aria_label:
'Edit label'
do
=
link_to
edit_label_path
(
label
),
class:
'btn btn-transparent label-action
edit
'
,
aria_label:
'Edit label'
do
=
sprite_icon
(
'pencil'
)
=
sprite_icon
(
'pencil'
)
%li
.inline
%li
.inline
.dropdown
.dropdown
...
@@ -42,6 +43,7 @@
...
@@ -42,6 +43,7 @@
container:
'body'
,
container:
'body'
,
toggle:
'modal'
}
}
toggle:
'modal'
}
}
=
_
(
'Promote to group label'
)
=
_
(
'Promote to group label'
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
%li
%li
%span
{
data:
{
toggle:
'modal'
,
target:
"#modal-delete-label-#{label.id}"
}
}
%span
{
data:
{
toggle:
'modal'
,
target:
"#modal-delete-label-#{label.id}"
}
}
%button
.text-danger.remove-row
{
type:
'button'
}=
_
(
'Delete'
)
%button
.text-danger.remove-row
{
type:
'button'
}=
_
(
'Delete'
)
...
...
spec/features/groups/labels/index_spec.rb
0 → 100644
View file @
fae42270
require
'spec_helper'
feature
'Group labels'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:group
)
{
create
(
:group
)
}
let!
(
:label
)
{
create
(
:group_label
,
group:
group
)
}
background
do
group
.
add_owner
(
user
)
sign_in
(
user
)
visit
group_labels_path
(
group
)
end
scenario
'label has edit button'
,
:js
do
expect
(
page
).
to
have_selector
(
'.label-action.edit'
)
end
end
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