add-child-pages.patch

Mizuki ISHIKAWA, 2019-06-27 08:25

Download (1.64 KB)

View differences:

app/views/wiki/_sidebar.html.erb
13 13
                   :action => 'date_index'}) %></li>
14 14
</ul>
15 15

  
16
<% if @page.present? && @page.children.present? %>
17
  <h3><%= l(:label_child_pages) %></h3>
18
  <%= render_page_hierarchy(@page.children.group_by(&:parent_id), @page.id, :timestamp => true) %>
19
<% end %>
20

  
16 21
<%= call_hook(:view_wiki_show_sidebar_bottom, :wiki => @wiki, :page => @page) %>
config/locales/en.yml
810 810
  label_wiki_page: Wiki page
811 811
  label_wiki_page_plural: Wiki pages
812 812
  label_wiki_page_new: New wiki page
813
  label_child_pages: Child pages
813 814
  label_index_by_title: Index by title
814 815
  label_index_by_date: Index by date
815 816
  label_current_version: Current version
test/functional/wiki_controller_test.rb
54 54
    # Included page with an inline image
55 55
    assert_select 'p', :text => /This is an inline image/
56 56
    assert_select 'img[src=?][alt=?]', '/attachments/download/3/logo.gif', 'This is a logo'
57
    assert_select '#sidebar ul.pages-hierarchy' do
58
      assert_select 'a', :text => 'Child 1'
59
      assert_select 'a', :text => 'Child 2'
60
    end
57 61
  end
58 62

  
59 63
  def test_show_old_version