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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
1f90df08
Commit
1f90df08
authored
Jun 28, 2016
by
Phil Hughes
Committed by
Alfredo Sumaran
Jul 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed collapsed assignee tooltip to users name
Fixes tooltip when updating the assignee Closes #19280 #19281
parent
4be505bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+5
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/assets/javascripts/users_select.js.coffee
View file @
1f90df08
...
@@ -56,6 +56,11 @@ class @UsersSelect
...
@@ -56,6 +56,11 @@ class @UsersSelect
username
:
''
username
:
''
avatar
:
''
avatar
:
''
$value
.
html
(
assigneeTemplate
(
user
))
$value
.
html
(
assigneeTemplate
(
user
))
$collapsedSidebar
.
attr
(
'title'
,
user
.
name
)
.
tooltip
(
'fixTitle'
)
$collapsedSidebar
.
html
(
collapsedAssigneeTemplate
(
user
))
$collapsedSidebar
.
html
(
collapsedAssigneeTemplate
(
user
))
...
@@ -63,7 +68,6 @@ class @UsersSelect
...
@@ -63,7 +68,6 @@ class @UsersSelect
'<% if( avatar ) { %>
'<% if( avatar ) { %>
<a class="author_link" href="/u/<%- username %>">
<a class="author_link" href="/u/<%- username %>">
<img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>">
<img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>">
<span class="author">Toni Boehm</span>
</a>
</a>
<% } else { %>
<% } else { %>
<i class="fa fa-user"></i>
<i class="fa fa-user"></i>
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
1f90df08
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
format: :json
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
format: :json
,
html:
{
class:
'issuable-context-form inline-update js-issuable-update'
}
do
|
f
|
.block.assignee
.block.assignee
.sidebar-collapsed-icon.sidebar-collapsed-user
{
data:
{
toggle:
"tooltip"
,
placement:
"left"
,
container:
"body"
},
title:
(
issuable
.
assignee
.
to_referenc
e
if
issuable
.
assignee
)}
.sidebar-collapsed-icon.sidebar-collapsed-user
{
data:
{
toggle:
"tooltip"
,
placement:
"left"
,
container:
"body"
},
title:
(
issuable
.
assignee
.
nam
e
if
issuable
.
assignee
)}
-
if
issuable
.
assignee
-
if
issuable
.
assignee
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
-
else
-
else
...
...
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