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
d399ffa2
Commit
d399ffa2
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use "Assigned to USER" tooltip in issue list item
parent
09e712c0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+3
-2
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
No files found.
app/helpers/projects_helper.rb
View file @
d399ffa2
...
@@ -21,7 +21,7 @@ module ProjectsHelper
...
@@ -21,7 +21,7 @@ module ProjectsHelper
end
end
def
link_to_member
(
project
,
author
,
opts
=
{})
def
link_to_member
(
project
,
author
,
opts
=
{})
default_opts
=
{
avatar:
true
,
name:
true
,
size:
16
,
author_class:
'author'
}
default_opts
=
{
avatar:
true
,
name:
true
,
size:
16
,
author_class:
'author'
,
title:
":name"
}
opts
=
default_opts
.
merge
(
opts
)
opts
=
default_opts
.
merge
(
opts
)
return
"(deleted)"
unless
author
return
"(deleted)"
unless
author
...
@@ -39,7 +39,8 @@ module ProjectsHelper
...
@@ -39,7 +39,8 @@ module ProjectsHelper
if
opts
[
:name
]
if
opts
[
:name
]
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link"
).
html_safe
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link"
).
html_safe
else
else
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link has_tooltip"
,
data:
{
:'original-title'
=>
sanitize
(
author
.
name
)
}
).
html_safe
title
=
opts
[
:title
].
sub
(
":name"
,
sanitize
(
author
.
name
))
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link has_tooltip"
,
data:
{
:'original-title'
=>
title
,
container:
'body'
}
).
html_safe
end
end
end
end
...
...
app/views/projects/issues/_issue.html.haml
View file @
d399ffa2
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
%span
%span
CLOSED
CLOSED
-
if
issue
.
assignee
-
if
issue
.
assignee
=
link_to_member
(
@project
,
issue
.
assignee
,
name:
false
)
=
link_to_member
(
@project
,
issue
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
note_count
=
issue
.
notes
.
user
.
count
-
note_count
=
issue
.
notes
.
user
.
count
-
if
note_count
>
0
-
if
note_count
>
0
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
d399ffa2
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
-
note_count
=
merge_request
.
mr_and_commit_notes
.
user
.
count
-
note_count
=
merge_request
.
mr_and_commit_notes
.
user
.
count
-
if
merge_request
.
assignee
-
if
merge_request
.
assignee
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
)
=
link_to_member
(
merge_request
.
source_project
,
merge_request
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
if
note_count
>
0
-
if
note_count
>
0
%span
%span
...
...
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