From bb1edda6e803c6a91fbcb7941fd619eb55be8d32 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 21 Jun 2008 12:32:47 +0000
Subject: [PATCH] Display issue notes in the activity view (#1509).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1567 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb |   3 ++-
 app/models/journal.rb                  |   2 +-
 public/images/ticket_note.png          | Bin 0 -> 784 bytes
 public/stylesheets/application.css     |   1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 public/images/ticket_note.png

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d15c6bc2a..c9a55088b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -258,7 +258,8 @@ class ProjectsController < ApplicationController
       @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
       
       cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      cond.add("#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> ''")
       @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
     end
     
diff --git a/app/models/journal.rb b/app/models/journal.rb
index ac141f68c..67a3eee3b 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -33,7 +33,7 @@ class Journal < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                 :description => :notes,
                 :author => :user,
-                :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },
+                :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
 
   def save
diff --git a/public/images/ticket_note.png b/public/images/ticket_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..c69db223f73adee7b012c00c27770678fe529ca2
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00007bV*G`2iOJ`
z3N0Cv=n)nG000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0005DP)t-s
z|NsB&@%N0Z&Eo3v_xbx^jJjNjx!&jS>Z48Qo<`@IKIWA*;*1{Rj3DHVA#j+%xz6HS
ziMZf>1K)W7>!(%u=C<+CmFTBS>#thw!hOfq=kfOWxXt2MhPQK?!|SVE_~W$ZpEBvI
zJNW6SroPyXt<TZk>-zlt`1}3c=ke<C_*{y)v&i1;tX=D^RqL-u`RT0s>aAvwz3lP$
z=kWOE@Au^H_xbz%;OX*kn8NF=Uhu<%{PWZN^U?b4vR;e2^7s1e^ZM!W_~PvL=kNFB
z?DTAv!0xtj^wFO1%6Ra{a`47(^7i`g_4@Ag`t9@j>+|{I>ho`x!SK0x{Px@U=bZTE
zmG|S1e4xj@(d6;=`tkMp@b&uX@b;|3+>NZx^u>(*_ucsDqWI^X%-idGpvPZ~yI_pF
zT8Ow|jk{=)zNWv~<m~hH$dmo|;rZ&S`RJqg<(Bv3koVz;_TPZ@-FN%($m^a!_RN?6
z{rUd;@c#Vp{rm3y`|thx@c#Yx?W0Ql+_L}v`u_d;|NZ*zs8jymw))bd`O%#C&6oGe
zlJ>@o^}>bpzkc+(cJa1u@Ums_tzCoUq^JM@00DGTPE!Ct=GbNc007WQL_t(|+GAiK
z4BFZ|I=i}idi(k(Oau!wHi1BMOH)%zD_EeSvZ|`Orna`OuD$^*keioZkX%?)TvA$A
z4i-pAOiB(*Nli;n%gD^i&S78(4hanlkBIb%ii(bjjf-bsaQE=^^0xQ!_45yK@(m1P
zV6d{bv9+^zaC9;;b#`%eV_?wL(>E|QGS)CLHPbS;uw-D6S5Q<^R#8<`SJ%+g($-;M
z5D^s<myncVm6nl}lam5k%fZRT&BM#bFCZu+jN~I0RyKANFETPQLl^+3axxK@j@j1$
O0000<MNUMnLSTaawbhOQ

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d87b3bf2b..48a8193e2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -190,6 +190,7 @@ div#activity dd span.description, #search-results dd span.description { display:
 dt.issue { background-image: url(../images/ticket.png); }
 dt.issue-edit { background-image: url(../images/ticket_edit.png); }
 dt.issue-closed { background-image: url(../images/ticket_checked.png); }
+dt.issue-note { background-image: url(../images/ticket_note.png); }
 dt.changeset { background-image: url(../images/changeset.png); }
 dt.news { background-image: url(../images/news.png); }
 dt.message { background-image: url(../images/message.png); }
-- 
2.39.5