diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-23 15:58:02 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-23 15:58:02 +0000 |
| commit | 724ca74f51e01e5f5d43fc8b9264de285f163713 (patch) | |
| tree | 72f47da847a4454919137c1bec79a8f25a43dd0f /app/views | |
| parent | 76d4ac17a2aa449b59f0dbd38de7f94bafce8fde (diff) | |
| download | redmine-724ca74f51e01e5f5d43fc8b9264de285f163713.tar.gz redmine-724ca74f51e01e5f5d43fc8b9264de285f163713.zip | |
patch #9429 Display Wiki edits in activity log (Nick Read)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@370 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/activity.rhtml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index 80386b9e1..b1d131aa9 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -9,7 +9,8 @@ <%= 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 %> @@ -35,6 +36,9 @@ <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> @@ -56,4 +60,4 @@ %> </div> <br /> -</div>
\ No newline at end of file +</div> |