From 4ded4277c51b8f35dc9eaa031c918e55470a44b5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 28 Oct 2007 16:13:39 +0000
Subject: [PATCH] Activity view now uses events attributes. Fixed: error on
activity feed if it contains a document.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@876 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/models/attachment.rb | 2 +-
app/views/common/feed.atom.rxml | 2 +-
app/views/projects/activity.rhtml | 37 ++++---------------------------
3 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 4591a1109..d2bcab33f 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -27,7 +27,7 @@ class Attachment < ActiveRecord::Base
acts_as_event :title => :filename,
:description => :filename,
- :url => Proc.new {|o| {:controller => 'attachment', :action => 'download', :id => o.id}}
+ :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
cattr_accessor :storage_path
@@storage_path = "#{RAILS_ROOT}/files"
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index b5f733460..59b3163f4 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -13,7 +13,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.link "rel" => "alternate", "href" => url_for(item.event_url(:only_path => false))
xml.id url_for(item.event_url(:only_path => false))
xml.updated item.event_datetime.xmlschema
- author = item.event_author
+ author = item.event_author if item.respond_to?(:author)
xml.author do
xml.name(author.is_a?(User) ? author.name : author)
xml.email(author.mail) if author.is_a?(User)
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 604b9f721..a2f5296f0 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -4,43 +4,14 @@
<h3><%= day_name(day.cwday) %> <%= day.day %></h3>
<ul>
<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| %>
- <li><p>
- <% if e.is_a? Issue %>
- <%= e.event_datetime.strftime("%H:%M") %> <%= link_to_issue e %>: <%=h e.subject %><br />
- <i><%= e.author.name %></i>
- <% elsif e.is_a? Journal %>
- <%= e.created_on.strftime("%H:%M") %> <%= link_to_issue e.journalized %>
- (<%=h (status = IssueStatus.find_by_id(e.details.first.value)) ? status.name : '?' %>): <%=h e.journalized.subject %><br />
- <em><%=h e.user.name %><%=h ": #{truncate(e.notes, 500)}" unless e.notes.blank? %></em>
- <% elsif e.is_a? News %>
- <%= e.event_datetime.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to h(e.title), :controller => 'news', :action => 'show', :id => e %><br />
- <% unless e.summary.empty? %><%=h e.summary %><br /><% end %>
- <i><%= e.author.name %></i>
- <% elsif (e.is_a? Attachment) and (e.container.is_a? Version) %>
- <%= e.event_datetime.strftime("%H:%M") %> <%=l(:label_attachment)%> (<%=h e.container.name %>): <%= link_to e.filename, :controller => 'projects', :action => 'list_files', :id => @project %><br />
- <i><%= e.author.name %></i>
- <% elsif (e.is_a? Attachment) and (e.container.is_a? Document) %>
- <%= e.event_datetime.strftime("%H:%M") %> <%=l(:label_attachment)%>: <%= e.filename %> (<%= link_to h(e.container.title), :controller => 'documents', :action => 'show', :id => e.container %>)<br />
- <i><%= e.author.name %></i>
- <% elsif e.is_a? Document %>
- <%= e.event_datetime.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.event_datetime.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 %><%= ', ' + link_to('diff', :controller => 'wiki', :action => 'diff', :page => e.title, :version => e.version) if e.version > 1 %>)<br />
- <% unless e.comments.blank? %><em><%=h e.comments %></em><% end %>
- <% elsif e.is_a? Changeset %>
- <%= e.event_datetime.strftime("%H:%M") %> <%=l(:label_revision)%> <%= link_to h(e.revision), :controller => 'repositories', :action => 'revision', :id => @project, :rev => e.revision %><br />
- <em><%=h e.committer.blank? ? "anonymous" : e.committer %><%= h(": #{truncate(e.comments, 500)}") unless e.comments.blank? %></em>
- <% end %>
- </p></li>
-
+ <li><p><%= e.event_datetime.strftime("%H:%M") %> <%= link_to truncate(e.event_title, 100), e.event_url %><br />
+ <% unless e.event_description.blank? %><em><%= truncate(e.event_description, 500) %></em><br /><% end %>
+ <span class="author"><%= e.event_author if e.respond_to?(:author) %></span></p></li>
<% end %>
</ul>
<% end %>
-<% if @events_by_day.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
+<% if @events_by_day.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
<div style="float:left;">
<% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
--
GitLab