BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
547ea3c8
Commit
547ea3c8
authored
Jun 16, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'kanban-fixes' into 'master'
Kanban improvements When drag from unassigned to assigned column - issue assignee avatar updated
parents
3e339636
8d240fb0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
milestone.js.coffee
app/assets/javascripts/milestone.js.coffee
+7
-0
issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-0
_issue.html.haml
app/views/projects/milestones/_issue.html.haml
+2
-2
No files found.
app/assets/javascripts/milestone.js.coffee
View file @
547ea3c8
...
...
@@ -6,6 +6,13 @@ class Milestone
data
:
data
success
:
(
data
)
->
if
data
.
saved
==
true
if
data
.
assignee_avatar_url
img_tag
=
$
(
'<img/>'
)
img_tag
.
attr
(
'src'
,
data
.
assignee_avatar_url
)
img_tag
.
addClass
(
'avatar s16'
)
$
(
li
).
find
(
'.assignee-icon'
).
html
(
img_tag
)
else
$
(
li
).
find
(
'.assignee-icon'
).
html
(
''
)
$
(
li
).
effect
'highlight'
else
new
Flash
(
"Issue update failed"
,
'alert'
)
...
...
app/controllers/projects/issues_controller.rb
View file @
547ea3c8
...
...
@@ -90,6 +90,7 @@ class Projects::IssuesController < Projects::ApplicationController
format
.
json
do
render
json:
{
saved:
@issue
.
valid?
,
assignee_avatar_url:
@issue
.
assignee
.
try
(
:avatar_url
)
}
end
end
...
...
app/views/projects/milestones/_issue.html.haml
View file @
547ea3c8
...
...
@@ -3,7 +3,7 @@
=
link_to
[
@project
,
issue
]
do
%span
.cgray
##{issue.iid}
=
link_to_gfm
issue
.
title
,
[
@project
,
issue
]
-
if
issue
.
assignee
.pull-right
.pull-right.assignee-icon
-
if
issue
.
assignee
=
image_tag
avatar_icon
(
issue
.
assignee
.
email
,
16
),
class:
"avatar s16"
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