add-assignee-icon-on-tooltip-v3.patch

Mizuki ISHIKAWA, 2018-08-20 02:19

Download (2.97 KB)

View differences:

app/helpers/issues_helper.rb
65 65
      "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
66 66
      "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
67 67
      "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
68
      "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
68
      "<strong>#{@cached_label_assigned_to}</strong>: #{avatar(issue.assigned_to, :size => "13", :title => l(:field_assigned_to)) if issue.assigned_to} #{h(issue.assigned_to)}<br />".html_safe +
69 69
      "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
70 70
  end
71 71

  
test/functional/calendars_controller_test.rb
33 33
           :queries
34 34

  
35 35
  def test_show
36
    get :show, :params => {
37
        :project_id => 1
38
      }
36
    with_settings :gravatar_enabled => '1' do
37
      get :show, :params => {
38
          :project_id => 1
39
        }
40
    end
39 41
    assert_response :success
40 42

  
41 43
    # query form
......
51 53

  
52 54
    # Assert context menu on issues
53 55
    assert_select 'form[data-cm-url=?]', '/issues/context_menu'
54
    assert_select 'div.issue.hascontextmenu' do
56
    assert_select 'div.issue.hascontextmenu.tooltip' do
55 57
      assert_select 'input[name=?][type=?]', 'ids[]', 'checkbox'
58
      assert_select 'img[class="gravatar"]'
56 59
    end
57 60
  end
58 61

  
test/functional/gantts_controller_test.rb
30 30
  def test_gantt_should_work
31 31
    i2 = Issue.find(2)
32 32
    i2.update_attribute(:due_date, 1.month.from_now)
33
    get :show, :params => {
34
        :project_id => 1
35
      }
33
    with_settings :gravatar_enabled => '1' do
34
      get :show, :params => {
35
          :project_id => 1
36
        }
37
    end
36 38
    assert_response :success
37 39

  
38 40
    # query form
......
49 51

  
50 52
    # Assert context menu on issues subject and gantt bar
51 53
    assert_select 'div[class=?]', 'issue-subject hascontextmenu'
52
    assert_select 'div[class=?]', 'tooltip hascontextmenu'
54
    assert_select 'div.tooltip.hascontextmenu' do
55
      assert_select 'img[class="gravatar"]'
56
    end
53 57
    assert_select "form[data-cm-url=?]", '/issues/context_menu'
54 58

  
55 59
    # Issue with start and due dates