diff options
38 files changed, 44 insertions, 3 deletions
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index e6cbdfee9..91996ba2f 100644 --- 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 2d76ca713..e83c5d893 100644 --- 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 e42de96b3..c03b5aecc 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -839,3 +839,4 @@ bs: label_group_plural: Groups
label_group: Group
label_group_new: New group
+ label_time_entry_plural: Spent time
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 75d4b9304..45f4a644f 100644 --- 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 7e605a559..087da5fbe 100644 --- 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 5b5742dcb..ec0386ab5 100644 --- 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 630ba0970..da3e8935c 100644 --- 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 43a46a4e5..8e20ed5c0 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -812,3 +812,4 @@ el: label_group_plural: Groups
label_group: Group
label_group_new: New group
+ label_time_entry_plural: Spent time
diff --git a/config/locales/en.yml b/config/locales/en.yml index 93733e425..190a6d797 100644 --- 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 8d8a535d2..af21eeff3 100644 --- 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 1d629a312..2a67e7243 100644 --- 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 c31f91096..7eb0f062b 100644 --- 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 04c666ba3..55bcd0b44 100644 --- 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 e72c805ce..423ebfbd5 100644 --- 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 918dbb405..4d4500546 100644 --- 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 5ee4eae24..5cb022fbe 100644 --- 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 7c9b3d26a..0bc521fc3 100644 --- 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 c03cf96bc..8d79fb0e9 100644 --- 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 0aa13183b..050fc1ce1 100644 --- 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 45d74a946..4f858aba8 100644 --- 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 8868f19cc..82b9d3252 100644 --- 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 6abf6076a..77850cae0 100644 --- 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 5d27a26de..578c4fa4e 100644 --- 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 2e40627e5..20b5b5330 100644 --- 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 05aa0cd7f..dde7dace3 100644 --- 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 310c3ad9c..e36e0c1a0 100644 --- 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 a51bb54c0..feb870d3e 100644 --- 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 22eb06097..d7434b99f 100644 --- 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 6bceb4315..c8aa7c26c 100644 --- 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 69c8c1668..d007017f3 100644 --- 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 a1fa9c80a..49d55940d 100644 --- 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 7710991f2..f7f57b134 100644 --- 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 0f0a4aab5..dbb085d6e 100644 --- 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 8dc8358a2..383d1953f 100644 --- 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 387c845cd..e27f946ca 100644 --- 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 53edb54a7..b55462284 100644 --- 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 0602691a4..76518802f 100644 --- 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 405ac5379..d4249dfb8 100644 --- 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); } |