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
f1b2cf0e
Commit
f1b2cf0e
authored
Nov 20, 2019
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue trying to edit weight with collapsed sidebar as guest
parent
faacf3dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
1 deletion
+39
-1
changelogs/unreleased/7150-the-weight-assignment-box-shows-up-when-the-sidebar-is-collapsed-eve.yml
...gnment-box-shows-up-when-the-sidebar-is-collapsed-eve.yml
+5
-0
ee/app/assets/javascripts/sidebar/components/weight/weight.vue
...p/assets/javascripts/sidebar/components/weight/weight.vue
+3
-1
ee/spec/features/issues/issue_sidebar_spec.rb
ee/spec/features/issues/issue_sidebar_spec.rb
+31
-0
No files found.
changelogs/unreleased/7150-the-weight-assignment-box-shows-up-when-the-sidebar-is-collapsed-eve.yml
0 → 100644
View file @
f1b2cf0e
---
title
:
Fix issue trying to edit weight with collapsed sidebar as guest
merge_request
:
20431
author
:
type
:
fixed
ee/app/assets/javascripts/sidebar/components/weight/weight.vue
View file @
f1b2cf0e
...
...
@@ -118,7 +118,9 @@ export default {
}
},
onCollapsedClick
()
{
this
.
showEditField
(
true
);
if
(
this
.
editable
)
{
this
.
showEditField
(
true
);
}
this
.
collapsedAfterUpdate
=
true
;
},
onSubmit
(
e
)
{
...
...
ee/spec/features/issues/issue_sidebar_spec.rb
View file @
f1b2cf0e
...
...
@@ -50,7 +50,38 @@ describe 'Issue Sidebar' do
end
end
context
'as a guest'
do
before
do
project
.
add_guest
(
user
)
visit_issue
(
project
,
issue
)
end
it
'does not have a option to edit weight'
do
expect
(
page
).
not_to
have_selector
(
'.block.weight .js-weight-edit-link'
)
end
end
context
'as a guest, interacting with collapsed sidebar'
,
:js
do
before
do
project
.
add_guest
(
user
)
resize_screen_sm
visit_issue
(
project
,
issue
)
end
it
'edit weight field does not appear after clicking on weight when sidebar is collapsed then expanding it'
do
find
(
'.js-weight-collapsed-block'
).
click
# Expand sidebar
open_issue_sidebar
expect
(
page
).
not_to
have_selector
(
'.block.weight .form-control'
)
end
end
def
visit_issue
(
project
,
issue
)
visit
project_issue_path
(
project
,
issue
)
end
def
open_issue_sidebar
find
(
'aside.right-sidebar.right-sidebar-collapsed .js-sidebar-toggle'
).
click
find
(
'aside.right-sidebar.right-sidebar-expanded'
)
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