@@ -508,7 +508,7 class ProjectsController < ApplicationController | |||
|
508 | 508 | @show_documents = 1 |
|
509 | 509 | end |
|
510 | 510 | |
|
511 | unless params[:show_wiki_edits] == "0" | |
|
511 | unless @project.wiki.nil? || params[:show_wiki_edits] == "0" | |
|
512 | 512 | select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " + |
|
513 | 513 | "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title" |
|
514 | 514 | joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " + |
@@ -11,7 +11,7 | |||
|
11 | 11 | <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0, :id => nil %> <%=l(:label_news_plural)%><br /> |
|
12 | 12 | <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0, :id => nil %> <%=l(:label_attachment_plural)%><br /> |
|
13 | 13 | <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%><br /> |
|
14 | <%= check_box_tag 'show_wiki_edits', 1, @show_wiki_edits %><%= hidden_field_tag 'show_wiki_edits', 0, :id => nil %> <%=l(:label_wiki_edit_plural)%> | |
|
14 | <% if @project.wiki %><%= check_box_tag 'show_wiki_edits', 1, @show_wiki_edits %><%= hidden_field_tag 'show_wiki_edits', 0, :id => nil %> <%=l(:label_wiki_edit_plural)%><% end %> | |
|
15 | 15 | </p> |
|
16 | 16 | <p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p> |
|
17 | 17 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now