jro_apps/redmine Commit - r367:724ca74f51e0

patch #9429 Display Wiki edits in activity log (Nick Read)...

Jean-Philippe Lang -

r367:724ca74f51e0

parent child

Context file:

r367:724ca74f51e0

Collapse all files

app/controllers/projects_controller.rb +20 0

@@ -499,6 +499,26 class ProjectsController < ApplicationController
499	@show_documents = 1	499	@show_documents = 1
500	end	500	end
501		501
		502	unless params[:show_wiki_edits] == "0"
		503	select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comment, " +
		504	"#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
		505	joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
		506	"LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
		507	conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
		508	@project.id, @date_from, @date_to]
		509
		510	WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions).each { \|i\|
		511	# We provide this alias so all events can be treated in the same manner
		512	def i.created_on
		513	self.updated_on
		514	end
		515
		516	@events_by_day[i.created_on.to_date] \|\|= []
		517	@events_by_day[i.created_on.to_date] << i
		518	}
		519	@show_wiki_edits = 1
		520	end
		521
502	render :layout => false if request.xhr?	522	render :layout => false if request.xhr?
503	end	523	end
504		524

app/models/wiki_page.rb +5 -1

               end
               def pretty_title
-                title.tr '_', ' '
+                WikiPage.pretty_title(title)
+              end
+              def self.pretty_title(str)
+                (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
             end

app/views/projects/activity.rhtml +5 -1

                 <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0, :id => nil %> <%=l(:label_issue_plural)%><br />
                 <%= 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)%>
+                <%= 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)%>
             </p>
             <p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
             <% end %>
                     <i><%= e.author.name %></i>
                 <% elsif e.is_a? Document %>
                   <%= e.created_on.strftime("%H:%M") %> <%=l(:label_document)%>: <%= link_to h(e.title), :controller => 'documents', :action => 'show', :id => e %><br />
+                <% elsif e.is_a? WikiContent.versioned_class %>
+                  <%= e.created_on.strftime("%H:%M") %> <%=l(:label_wiki_edit)%>: <%= link_to h(WikiPage.pretty_title(e.title)), :controller => 'wiki', :page => e.title %> (<%= link_to '#' + e.version.to_s, :controller => 'wiki', :page => e.title, :version => e.version %>)<br />
+                  <% unless e.comment.blank? %><em><%=h e.comment %></em><% end %>
                 <% end %>
                 </p></li>

lang/de.yml +2 0

             label_result_plural: %d Resultate
             label_all_words: Alle Wörter
             label_wiki: Wiki
+            label_wiki_edit: Wiki edit
+            label_wiki_edit_plural: Wiki edits
             label_page_index: Index
             label_current_version: Gegenwärtige Version
             label_preview: Preview

lang/en.yml +2 0

             label_result_plural: %d results
             label_all_words: All words
             label_wiki: Wiki
+            label_wiki_edit: Wiki edit
+            label_wiki_edit_plural: Wiki edits
             label_page_index: Index
             label_current_version: Current version
             label_preview: Preview

lang/es.yml +2 0

             label_result_plural: %d resultados
             label_all_words: Todas las palabras
             label_wiki: Wiki
+            label_wiki_edit: Wiki edit
+            label_wiki_edit_plural: Wiki edits
             label_page_index: Índice
             label_current_version: Versión actual
             label_preview: Previo

lang/fr.yml +2 0

             label_result_plural: %d résultats
             label_all_words: Tous les mots
             label_wiki: Wiki
+            label_wiki_edit: Révision wiki
+            label_wiki_edit_plural: Révisions wiki
             label_page_index: Index
             label_current_version: Version actuelle
             label_preview: Prévisualisation

lang/it.yml +2 0

             label_result_plural: %d risultati
             label_all_words: Tutte le parole
             label_wiki: Wiki
+            label_wiki_edit: Wiki edit
+            label_wiki_edit_plural: Wiki edits
             label_page_index: Indice
             label_current_version: Versione corrente
             label_preview: Previsione

lang/ja.yml +2 0

             label_result_plural: %d 件の結果
             label_all_words: すべての単語
             label_wiki: Wiki
+            label_wiki_edit: Wiki edit
+            label_wiki_edit_plural: Wiki edits
             label_page_index: 索引
             label_current_version: 最近版
             label_preview: 下検分

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages