0001-show-issue-assignee-on-roadmap.patch

Marius BALTEANU, 2018-04-09 13:03

Download (4.41 KB)

View differences:

app/views/versions/index.html.erb
27 27
        <table class="list related-issues">
28 28
        <caption><%= l(:label_related_issues) %></caption>
29 29
        <% issues.each do |issue| -%>
30
          <tr class="hascontextmenu">
30
          <tr class="issue hascontextmenu">
31 31
            <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
32 32
            <td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
33
            <td class="assignee"><%= avatar(issue.assigned_to, :size => "20", :class => "gravatar", :title => l(:label_attribute_with_value, :attribute => l(:field_assigned_to), :value => issue.assigned_to.to_s)) if issue.assigned_to %></td>
33 34
          </tr>
34 35
        <% end -%>
35 36
        </table>
app/views/versions/show.html.erb
44 44
    <tr class="issue hascontextmenu">
45 45
      <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
46 46
      <td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
47
      <td class="assignee"><%= avatar(issue.assigned_to, :size => "20", :class => "gravatar", :title => l(:label_attribute_with_value, :attribute => l(:field_assigned_to), :value => issue.assigned_to.to_s)) if issue.assigned_to %></td>
47 48
    </tr>
48 49
  <% end %>
49 50
  </table>
config/locales/en.yml
1024 1024
  label_font_monospace: Monospaced font
1025 1025
  label_font_proportional: Proportional font
1026 1026
  label_last_notes: Last notes
1027
  label_attribute_with_value: "%{attribute}: %{value}"
1027 1028

  
1028 1029
  button_login: Login
1029 1030
  button_submit: Submit
public/stylesheets/application.css
531 531
div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
532 532

  
533 533
div#roadmap .related-issues { margin-bottom: 1em; }
534
div#roadmap .related-issues tr.issue { height: 25px; }
534 535
div#roadmap .related-issues td.checkbox { display: none; }
536
div#roadmap .related-issues td.assignee { text-align: right; }
535 537
div#roadmap .wiki h1:first-child { display: none; }
536 538
div#roadmap .wiki h1 { font-size: 120%; }
537 539
div#roadmap .wiki h2 { font-size: 110%; }
test/functional/versions_controller_test.rb
46 46
      # Links to completed versions in the sidebar
47 47
      assert_select 'a[href=?]', '/versions/1'
48 48
    end
49

  
50
    # Issue with assignee should contain user's avatar
51
    assert_select 'td.assignee img[class=?][title=?]', 'gravatar', 'Assignee: Dave Lopper'
49 52
  end
50 53

  
51 54
  def test_index_with_completed_versions
......
99 102
    assert_response :success
100 103

  
101 104
    assert_select 'h2', :text => /1.0/
105

  
106
    assert_select '#roadmap' do
107
      # Issue without assignee should not contain user's avatar
108
      assert_select 'tr.issue:first-child td.assignee img', 0
109
      # Issue with assignee should contain user's avatar
110
      assert_select 'tr.issue td.assignee img[class=?][title=?]', 'gravatar', 'Assignee: Dave Lopper'
111
    end
102 112
  end
103 113

  
104 114
  def test_show_issue_calculations_should_take_into_account_only_visible_issues
105
-