Commit 547ea3c8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'kanban-fixes' into 'master'

Kanban improvements

When drag from unassigned to assigned column - issue assignee avatar updated
parents 3e339636 8d240fb0
...@@ -6,6 +6,13 @@ class Milestone ...@@ -6,6 +6,13 @@ class Milestone
data: data data: data
success: (data) -> success: (data) ->
if data.saved == true 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' $(li).effect 'highlight'
else else
new Flash("Issue update failed", 'alert') new Flash("Issue update failed", 'alert')
......
...@@ -90,6 +90,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -90,6 +90,7 @@ class Projects::IssuesController < Projects::ApplicationController
format.json do format.json do
render json: { render json: {
saved: @issue.valid?, saved: @issue.valid?,
assignee_avatar_url: @issue.assignee.try(:avatar_url)
} }
end end
end end
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= link_to [@project, issue] do = link_to [@project, issue] do
%span.cgray ##{issue.iid} %span.cgray ##{issue.iid}
= link_to_gfm issue.title, [@project, issue] = link_to_gfm issue.title, [@project, issue]
- if issue.assignee .pull-right.assignee-icon
.pull-right - if issue.assignee
= image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16" = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment