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
351e97d7
Commit
351e97d7
authored
Mar 08, 2021
by
Kev
Committed by
Olena Horal-Koretska
Mar 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix invite member modal dropdown checkbox styling
parent
f87cff66
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
6 deletions
+13
-6
app/assets/javascripts/invite_members/components/invite_members_modal.vue
...cripts/invite_members/components/invite_members_modal.vue
+2
-1
app/assets/javascripts/invite_members/init_invite_members_modal.js
...s/javascripts/invite_members/init_invite_members_modal.js
+1
-0
changelogs/unreleased/322082-fix-invite-member-modal-dropdown-styling.yml
...eased/322082-fix-invite-member-modal-dropdown-styling.yml
+5
-0
spec/frontend/invite_members/components/invite_members_modal_spec.js
...nd/invite_members/components/invite_members_modal_spec.js
+5
-5
No files found.
app/assets/javascripts/invite_members/components/invite_members_modal.vue
View file @
351e97d7
...
@@ -49,7 +49,7 @@ export default {
...
@@ -49,7 +49,7 @@ export default {
required
:
true
,
required
:
true
,
},
},
defaultAccessLevel
:
{
defaultAccessLevel
:
{
type
:
String
,
type
:
Number
,
required
:
true
,
required
:
true
,
},
},
helpLink
:
{
helpLink
:
{
...
@@ -280,6 +280,7 @@ export default {
...
@@ -280,6 +280,7 @@ export default {
<gl-dropdown-item
<gl-dropdown-item
:key=
"key"
:key=
"key"
active-class=
"is-active"
active-class=
"is-active"
is-check-item
:is-checked=
"key === selectedAccessLevel"
:is-checked=
"key === selectedAccessLevel"
@
click=
"changeSelectedItem(key)"
@
click=
"changeSelectedItem(key)"
>
>
...
...
app/assets/javascripts/invite_members/init_invite_members_modal.js
View file @
351e97d7
...
@@ -20,6 +20,7 @@ export default function initInviteMembersModal() {
...
@@ -20,6 +20,7 @@ export default function initInviteMembersModal() {
...
el
.
dataset
,
...
el
.
dataset
,
isProject
:
parseBoolean
(
el
.
dataset
.
isProject
),
isProject
:
parseBoolean
(
el
.
dataset
.
isProject
),
accessLevels
:
JSON
.
parse
(
el
.
dataset
.
accessLevels
),
accessLevels
:
JSON
.
parse
(
el
.
dataset
.
accessLevels
),
defaultAccessLevel
:
parseInt
(
el
.
dataset
.
defaultAccessLevel
,
10
),
},
},
}),
}),
});
});
...
...
changelogs/unreleased/322082-fix-invite-member-modal-dropdown-styling.yml
0 → 100644
View file @
351e97d7
---
title
:
Fix invite member modal dropdown checkbox styling
merge_request
:
55832
author
:
Kev @KevSlashNull
type
:
fixed
spec/frontend/invite_members/components/invite_members_modal_spec.js
View file @
351e97d7
...
@@ -10,7 +10,7 @@ const name = 'test name';
...
@@ -10,7 +10,7 @@ const name = 'test name';
const
isProject
=
false
;
const
isProject
=
false
;
const
inviteeType
=
'
members
'
;
const
inviteeType
=
'
members
'
;
const
accessLevels
=
{
Guest
:
10
,
Reporter
:
20
,
Developer
:
30
,
Maintainer
:
40
,
Owner
:
50
};
const
accessLevels
=
{
Guest
:
10
,
Reporter
:
20
,
Developer
:
30
,
Maintainer
:
40
,
Owner
:
50
};
const
defaultAccessLevel
=
'
10
'
;
const
defaultAccessLevel
=
10
;
const
helpLink
=
'
https://example.com
'
;
const
helpLink
=
'
https://example.com
'
;
const
user1
=
{
id
:
1
,
name
:
'
Name One
'
,
username
:
'
one_1
'
,
avatar_url
:
''
};
const
user1
=
{
id
:
1
,
name
:
'
Name One
'
,
username
:
'
one_1
'
,
avatar_url
:
''
};
...
@@ -167,7 +167,7 @@ describe('InviteMembersModal', () => {
...
@@ -167,7 +167,7 @@ describe('InviteMembersModal', () => {
describe
(
'
when inviting an existing user to group by user ID
'
,
()
=>
{
describe
(
'
when inviting an existing user to group by user ID
'
,
()
=>
{
const
postData
=
{
const
postData
=
{
user_id
:
'
1
'
,
user_id
:
'
1
'
,
access_level
:
'
10
'
,
access_level
:
defaultAccessLevel
,
expires_at
:
undefined
,
expires_at
:
undefined
,
format
:
'
json
'
,
format
:
'
json
'
,
};
};
...
@@ -238,7 +238,7 @@ describe('InviteMembersModal', () => {
...
@@ -238,7 +238,7 @@ describe('InviteMembersModal', () => {
describe
(
'
when inviting a new user by email address
'
,
()
=>
{
describe
(
'
when inviting a new user by email address
'
,
()
=>
{
const
postData
=
{
const
postData
=
{
access_level
:
'
10
'
,
access_level
:
defaultAccessLevel
,
expires_at
:
undefined
,
expires_at
:
undefined
,
email
:
'
email@example.com
'
,
email
:
'
email@example.com
'
,
format
:
'
json
'
,
format
:
'
json
'
,
...
@@ -287,7 +287,7 @@ describe('InviteMembersModal', () => {
...
@@ -287,7 +287,7 @@ describe('InviteMembersModal', () => {
describe
(
'
when inviting members and non-members in same click
'
,
()
=>
{
describe
(
'
when inviting members and non-members in same click
'
,
()
=>
{
const
postData
=
{
const
postData
=
{
access_level
:
'
10
'
,
access_level
:
defaultAccessLevel
,
expires_at
:
undefined
,
expires_at
:
undefined
,
format
:
'
json
'
,
format
:
'
json
'
,
};
};
...
@@ -348,7 +348,7 @@ describe('InviteMembersModal', () => {
...
@@ -348,7 +348,7 @@ describe('InviteMembersModal', () => {
describe
(
'
when sharing the group is successful
'
,
()
=>
{
describe
(
'
when sharing the group is successful
'
,
()
=>
{
const
groupPostData
=
{
const
groupPostData
=
{
group_id
:
sharedGroup
.
id
,
group_id
:
sharedGroup
.
id
,
group_access
:
'
10
'
,
group_access
:
defaultAccessLevel
,
expires_at
:
undefined
,
expires_at
:
undefined
,
format
:
'
json
'
,
format
:
'
json
'
,
};
};
...
...
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