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
3e596225
Commit
3e596225
authored
Jun 05, 2017
by
kushalpandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update as per review feedback
parent
9a9bb024
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
...vascripts/protected_tags/protected_tag_access_dropdown.js
+9
-9
No files found.
app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
View file @
3e596225
...
@@ -66,7 +66,7 @@ export default class ProtectedTagAccessDropdown {
...
@@ -66,7 +66,7 @@ export default class ProtectedTagAccessDropdown {
self
.
$wrap
.
find
(
`.item-
${
item
.
type
}
`
).
removeClass
(
'
is-active
'
);
self
.
$wrap
.
find
(
`.item-
${
item
.
type
}
`
).
removeClass
(
'
is-active
'
);
}
else
{
}
else
{
const
$noOne
=
self
.
$wrap
.
find
(
`.is-active.item-
${
item
.
type
}
[data-role-
name="No one
"]`
);
const
$noOne
=
self
.
$wrap
.
find
(
`.is-active.item-
${
item
.
type
}
[data-role-
id="
${
self
.
noOneObj
.
id
}
"]`
);
if
(
$noOne
.
length
)
{
if
(
$noOne
.
length
)
{
$noOne
.
removeClass
(
'
is-active
'
);
$noOne
.
removeClass
(
'
is-active
'
);
self
.
removeSelectedItem
(
self
.
noOneObj
);
self
.
removeSelectedItem
(
self
.
noOneObj
);
...
@@ -430,10 +430,10 @@ export default class ProtectedTagAccessDropdown {
...
@@ -430,10 +430,10 @@ export default class ProtectedTagAccessDropdown {
return
`
return
`
<li>
<li>
<a href=
'#' class='
${
isActiveClass
}
'
>
<a href=
"#" class="
${
isActiveClass
}
"
>
<img src=
'
${
user
.
avatar_url
}
' class='avatar avatar-inline' width='30'
>
<img src=
"
${
user
.
avatar_url
}
" class="avatar avatar-inline" width="30"
>
<strong class=
'dropdown-menu-user-full-name'
>
${
user
.
name
}
</strong>
<strong class=
"dropdown-menu-user-full-name"
>
${
user
.
name
}
</strong>
<span class=
'dropdown-menu-user-username'
>
${
user
.
username
}
</span>
<span class=
"dropdown-menu-user-username"
>
${
user
.
username
}
</span>
</a>
</a>
</li>
</li>
`
;
`
;
...
@@ -441,13 +441,13 @@ export default class ProtectedTagAccessDropdown {
...
@@ -441,13 +441,13 @@ export default class ProtectedTagAccessDropdown {
groupRowHtml
(
group
,
isActive
)
{
groupRowHtml
(
group
,
isActive
)
{
const
isActiveClass
=
isActive
||
''
;
const
isActiveClass
=
isActive
||
''
;
const
avatarEl
=
group
.
avatar_url
?
`<img src=
'
${
group
.
avatar_url
}
' class='avatar avatar-inline' width='30'
>`
:
''
;
const
avatarEl
=
group
.
avatar_url
?
`<img src=
"
${
group
.
avatar_url
}
" class="avatar avatar-inline" width="30"
>`
:
''
;
return
`
return
`
<li>
<li>
<a href=
'#' class='
${
isActiveClass
}
'
>
<a href=
"#" class="
${
isActiveClass
}
"
>
${
avatarEl
}
${
avatarEl
}
<span class=
'dropdown-menu-group-groupname'
>
${
group
.
name
}
</span>
<span class=
"dropdown-menu-group-groupname"
>
${
group
.
name
}
</span>
</a>
</a>
</li>
</li>
`
;
`
;
...
@@ -458,7 +458,7 @@ export default class ProtectedTagAccessDropdown {
...
@@ -458,7 +458,7 @@ export default class ProtectedTagAccessDropdown {
return
`
return
`
<li>
<li>
<a href=
'#' class='
${
isActiveClass
}
' item-
${
role
.
type
}
' data-role-name="
${
role
.
text
}
">
<a href=
"#" class="
${
isActiveClass
}
item-
${
role
.
type
}
" data-role-id="
${
role
.
id
}
">
${
role
.
text
}
${
role
.
text
}
</a>
</a>
</li>
</li>
...
...
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