Removed "Wiki edits" option in the activity view if the project has no wiki.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@517 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 971d0acd35eaef4beeb41b950fd85fbdab290fa1..82468c21a7b8465e016df453f0979e5df8b3e28a 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -508,7 +508,7 @@ class ProjectsController < ApplicationController
       @show_documents = 1 
     end
     
-    unless params[:show_wiki_edits] == "0"
+    unless @project.wiki.nil? || params[:show_wiki_edits] == "0"
       select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
       joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 0ade2335da54ce4e805afb6c9e85f52c82af874f..5e9d0f992dcf190df00b0bab10a5bd8917996bea 100644 (file)
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -11,7 +11,7 @@
     <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0, :id => nil %> <%=l(:label_news_plural)%><br />
     <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0, :id => nil %> <%=l(:label_attachment_plural)%><br />
     <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%><br />
-    <%= check_box_tag 'show_wiki_edits', 1, @show_wiki_edits %><%= hidden_field_tag 'show_wiki_edits', 0, :id => nil %> <%=l(:label_wiki_edit_plural)%>
+    <% 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 %>
 </p>
 <p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
 <% end %>