diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /app/views/wiki | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
| -rw-r--r-- | app/views/wiki/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/wiki/rename.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 3a5a4709f..40e6b792a 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -23,7 +23,7 @@ <%= fp.select :parent_id, content_tag('option', '', :value => '') + wiki_page_options_for_select( - @wiki.pages.includes(:parent).all - + @wiki.pages.includes(:parent).to_a - @page.self_and_descendants, @page.parent) %> </p> <% end %> diff --git a/app/views/wiki/rename.html.erb b/app/views/wiki/rename.html.erb index c1a8f33ac..85319520d 100644 --- a/app/views/wiki/rename.html.erb +++ b/app/views/wiki/rename.html.erb @@ -13,7 +13,7 @@ <p><%= f.select :parent_id, content_tag('option', '', :value => '') + wiki_page_options_for_select( - @wiki.pages.includes(:parent).all - @page.self_and_descendants, + @wiki.pages.includes(:parent).to_a - @page.self_and_descendants, @page.parent), :label => :field_parent_title %></p> </div> |