Download as
Browse Code »

Commit 547ea3c80d53c8741f62b435f59427f7ebd4401a

Authored by Dmitriy Zaporozhets
2 parents 3e339636 8d240fb0
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'kanban-fixes' into 'master' 

Kanban improvements

When drag from unassigned to assigned column - issue assignee avatar updated
Showing 3 changed files with 10 additions and 2 deletions   Show diff stats
app/assets/javascripts/milestone.js.coffee
  Diff comments   View file @547ea3c
... ... @@ -6,6 +6,13 @@ class Milestone
6 6 data: data
7 7 success: (data) ->
8 8 if data.saved == true
  9 + if data.assignee_avatar_url
  10 + img_tag = $('<img/>')
  11 + img_tag.attr('src', data.assignee_avatar_url)
  12 + img_tag.addClass('avatar s16')
  13 + $(li).find('.assignee-icon').html(img_tag)
  14 + else
  15 + $(li).find('.assignee-icon').html('')
9 16 $(li).effect 'highlight'
10 17 else
11 18 new Flash("Issue update failed", 'alert')
... ...
app/controllers/projects/issues_controller.rb
  Diff comments   View file @547ea3c
... ... @@ -90,6 +90,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
90 90 format.json do
91 91 render json: {
92 92 saved: @issue.valid?,
  93 + assignee_avatar_url: @issue.assignee.try(:avatar_url)
93 94 }
94 95 end
95 96 end
... ...
app/views/projects/milestones/_issue.html.haml
  Diff comments   View file @547ea3c
... ... @@ -3,7 +3,7 @@
3 3 = link_to [@project, issue] do
4 4 %span.cgray ##{issue.iid}
5 5 = link_to_gfm issue.title, [@project, issue]
6   - - if issue.assignee
7   - .pull-right
  6 + .pull-right.assignee-icon
  7 + - if issue.assignee
8 8 = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
9 9  
... ...