Adds spent time to the activity view (#3809).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2877 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index e6cbdfee95784419069eff17104beb1049b33340..91996ba2f22033ae50dbdcd0b92b7e6641595707 100644 (file)
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -26,11 +26,15 @@ class TimeEntry < ActiveRecord::Base
   attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
 
   acts_as_customizable
-  acts_as_event :title => Proc.new {|o| "#{o.user}: #{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
-                :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project}},
+  acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
+                :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project, :issue_id => o.issue}},
                 :author => :user,
                 :description => :comments
-  
+
+  acts_as_activity_provider :timestamp => "#{table_name}.created_on",
+                            :author_key => :user_id,
+                            :find_options => {:include => :project} 
+
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
   validates_numericality_of :hours, :allow_nil => true, :message => :invalid
   validates_length_of :comments, :maximum => 255, :allow_nil => true

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 2d76ca713423c8d16bb7331dce89c844a6f31687..e83c5d89368a8d3f672638f0aba75f9cc3e796a3 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -806,3 +806,4 @@ bg:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index e42de96b3f9b82de90e34c319dd03ccfe5edc743..c03b5aeccb6f9ed299d718bcf4101f18df0f9467 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -839,3 +839,4 @@ bs:
   label_group_plural: Groups\r
   label_group: Group\r
   label_group_new: New group\r
+  label_time_entry_plural: Spent time\r

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 75d4b9304234780b49cac1f243ddfe1a602f09fc..45f4a644f7dbd014a779669fa394029511d9ecd8 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -809,3 +809,4 @@ ca:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7e605a5594a04c3ff713af508c89a3368ead346a..087da5fbedf30b1ca9ecad6f6cc3b0f6f6def77f 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -812,3 +812,4 @@ cs:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5b5742dcbcefd9349203d7ecb3fafdf7318f64ac..ec0386ab5ec662d5935022ef056ae185ba78a123 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -839,3 +839,4 @@ da:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 630ba09706a52d2a8cb4e4f349bb711f756fe2fc..da3e8935c595449e989b940e24b1f5445380b6e6 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -838,3 +838,4 @@ de:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 43a46a4e5095a7f3c4e86f4264cc835fbe675737..8e20ed5c09cf957595157f6e88148b26300f3601 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -812,3 +812,4 @@ el:
   label_group_plural: Groups\r
   label_group: Group\r
   label_group_new: New group\r
+  label_time_entry_plural: Spent time\r

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93733e42596a47b39e54d0f3cae3a6b64422a412..190a6d797b519bd7f4c9948dbc53204e43cdeae2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -686,6 +686,7 @@ en:
   label_group: Group
   label_group_plural: Groups
   label_group_new: New group
+  label_time_entry_plural: Spent time
   
   button_login: Login
   button_submit: Submit

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8d8a535d2ad2f917a89e6d4f05972ba5353c8d2f..af21eeff3efcf0ed4e7425512c7e75f096e93e0b 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -859,3 +859,4 @@ es:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1d629a312c1e30d12817165f72b45bfcfa0a2c29..2a67e72435634164ab73c6d085e6679cab3c981b 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -849,3 +849,4 @@ fi:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c31f91096f6953584da83942e2d7c24e25bd3874..7eb0f062b306efc92c3178d79696fdae83620f68 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -711,6 +711,7 @@ fr:
   label_group_plural: Groupes
   label_group: Groupe
   label_group_new: Nouveau groupe
+  label_time_entry_plural: Temps passé
   
   button_login: Connexion
   button_submit: Soumettre

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 04c666ba3adbd3df9ddf39e9074ee99d3f9841e8..55bcd0b44bcb996f7d32e6973cc1ef8317f7cc2a 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -838,3 +838,4 @@ gl:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/he.yml b/config/locales/he.yml
index e72c805ce6c41133ccb11a316c216e30e64e0461..423ebfbd584a5f428b4a49d88fa9a1bb358a9929 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -821,3 +821,4 @@ he:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 918dbb405d23a356eeaa9529bd7b98d0cfedd8f2..4d45005460e3d9381e43c85b10e2127894f01908 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -844,3 +844,4 @@
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5ee4eae24e003d3cba3c8f9935efc703f3fcfad7..5cb022fbed0f116d42f13ab19ee53cbb889c7eb2 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -824,3 +824,4 @@ it:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7c9b3d26a8275d42e7febd0006fe17e75e5c7258..0bc521fc3ac9a5a8ed181f787b34f92c6d85e778 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -846,3 +846,4 @@ ja:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c03cf96bc1919848cd3c4503d583d0fd6bf3681f..8d79fb0e9ae6aa7059c08afc570df4b8da243842 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -878,3 +878,4 @@ ko:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 0aa13183b7100459aac38d07da03c5ecc12f1766..050fc1ce1c00e0806049ce5544bc7dca77cde668 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -849,3 +849,4 @@ lt:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 45d74a9460f386e1b9d6999830297c4bf4bfed94..4f858aba8d5f44246ea23e86e7216c0df87d5e8e 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -794,3 +794,4 @@ nl:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 8868f19ccd524613a19792a49743d0670efa7b69..82b9d3252abcb7059d9d414991dee1059d387b97 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -811,3 +811,4 @@
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6abf6076a2c309d0a693ec61ac1fe2f36f96bdea..77850cae077cf737740489fde82ee196258dc4fa 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -842,3 +842,4 @@ pl:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 5d27a26deaa6b40337693b22b5664cc9c7edf198..578c4fa4eefd6f8ad940ed63f3e79a0c260425b3 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -844,3 +844,4 @@ pt-BR:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 2e40627e5b3226182598da544a47e6b9f79cafd8..20b5b5330b39c2874201c5b7710fc7e1a14caf63 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -830,3 +830,4 @@ pt:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 05aa0cd7f7ce2a66763aebec18e6b18c93715c0d..dde7dace30a479d03204e6fafb17df78577728ef 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -809,3 +809,4 @@ ro:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 310c3ad9cebd245bcfedd7c6c09fc3e1b97446ce..e36e0c1a0a7a17931ebc0b778571be8b09a5a934 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -936,3 +936,4 @@ ru:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a51bb54c06ef270b044df4eb02df10eb124c9fdc..feb870d3e1bdb8b87a3b72338b9d5bd7cc89cde2 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -811,3 +811,4 @@ sk:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 22eb06097cc8fe47afc000a5f426c216c0aa5aaf..d7434b99f1fc6431d092f7b7d4a128767354fcb9 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -808,3 +808,4 @@ sl:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6bceb431584a31b2b5c82ea68ad439e2428f0e7b..c8aa7c26c180f6547cffdbf4b067051841804915 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -832,3 +832,4 @@
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 69c8c1668fbaff1ac45b911f0fc751a78164bc24..d007017f33294c6e3bf9570193ab7e568c62e556 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -866,3 +866,4 @@ sv:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/th.yml b/config/locales/th.yml
index a1fa9c80af97a6b9721aa05b0898e9a54dcdfba3..49d55940daf84f1ebb89263616772e1a89d62de2 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -809,3 +809,4 @@ th:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7710991f2e327b585e40d145778dcffde3576146..f7f57b134fb0ebf82c9fd578d6789c860b0c5819 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -845,3 +845,4 @@ tr:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 0f0a4aab5c05d73e9492e1f5aa85851130849dd1..dbb085d6e2db75d4deef9732b091c192593b8e70 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -808,3 +808,4 @@ uk:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 8dc8358a248091b7bf9c4835ba74aa451f947137..383d1953f8eb5c380f42ddeaf6ac4e62a07eabcb 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -878,3 +878,4 @@ vi:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 387c845cd7ef145930eda2439e7ea7a8fb6ef6be..e27f946ca580a288085b9c03023ea6b50bad1ea4 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -916,3 +916,4 @@
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 53edb54a7c54a65a509371bbc60313fd21268210..b55462284a15a960ba9e5602c87d0850f0a082ac 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -841,3 +841,4 @@ zh:
   label_group_plural: Groups
   label_group: Group
   label_group_new: New group
+  label_time_entry_plural: Spent time

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 0602691a40c531cd38d4a246b35e389519d00efc..76518802fa14c853b5115fd502666a0293a624ec 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -157,6 +157,7 @@ Redmine::Activity.map do |activity|
   activity.register :files, :class_name => 'Attachment'
   activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
   activity.register :messages, :default => false
+  activity.register :time_entries, :default => false
 end
 
 Redmine::WikiFormatting.map do |format|

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 405ac5379276c6da0d711b6caed7e558c9058ca3..d4249dfb8376dd44d60f1d79526493cd11d4e66d 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -244,6 +244,7 @@ dt.wiki-page { background-image: url(../images/wiki_edit.png); }
 dt.attachment { background-image: url(../images/attachment.png); }
 dt.document { background-image: url(../images/document.png); }
 dt.project { background-image: url(../images/projects.png); }
+dt.time-entry { background-image: url(../images/time.png); }
 
 #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }