Skip to content

GitLab

Commit 2402c9ad authored by jplang's avatar jplang
Browse files

Adds filters for custom fields related to the project and user of time entries (#10191). 

git-svn-id: https://svn.redmine.org/redmine/trunk@10971 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent ee27e2b7
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 0 deletions
app/models/time_entry_query.rb
View file @ 2402c9ad
......@@ -88,6 +88,7 @@ class TimeEntryQuery < Query
} unless activities.empty?
add_custom_fields_filters(TimeEntryCustomField.where(:is_filter => true).all)
add_associations_custom_fields_filters :project, :user
@available_filters.each do |field, options|
options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
......
config/locales/ar.yml
View file @ 2402c9ad
......@@ -1081,3 +1081,4 @@ ar:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/bg.yml
View file @ 2402c9ad
......@@ -1079,3 +1079,4 @@ bg:
description_date_from: Въведете начална дата
description_date_to: Въведете крайна дата
text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
label_attribute_of_user: User's %{name}
config/locales/bs.yml
View file @ 2402c9ad
......@@ -1094,3 +1094,4 @@ bs:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/ca.yml
View file @ 2402c9ad
......@@ -1083,3 +1083,4 @@ ca:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/cs.yml
View file @ 2402c9ad
......@@ -1084,3 +1084,4 @@ cs:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/da.yml
View file @ 2402c9ad
......@@ -1098,3 +1098,4 @@ da:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/de.yml
View file @ 2402c9ad
......@@ -1097,3 +1097,4 @@ de:
setting_non_working_week_days: Arbeitsfreie Tage
label_in_the_next_days: in den nächsten
label_in_the_past_days: in den letzten
label_attribute_of_user: User's %{name}
config/locales/el.yml
View file @ 2402c9ad
......@@ -1081,3 +1081,4 @@ el:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/en-GB.yml
View file @ 2402c9ad
......@@ -1083,3 +1083,4 @@ en-GB:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/en.yml
View file @ 2402c9ad
......@@ -884,6 +884,7 @@ en:
label_attribute_of_project: "Project's %{name}"
label_attribute_of_author: "Author's %{name}"
label_attribute_of_assigned_to: "Assignee's %{name}"
label_attribute_of_user: "User's %{name}"
label_attribute_of_fixed_version: "Target version's %{name}"
label_cross_project_descendants: With subprojects
label_cross_project_tree: With project tree
......
config/locales/es.yml
View file @ 2402c9ad
......@@ -1118,3 +1118,4 @@ es:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/et.yml
View file @ 2402c9ad
......@@ -1094,3 +1094,4 @@ et:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/eu.yml
View file @ 2402c9ad
......@@ -1082,3 +1082,4 @@ eu:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/fa.yml
View file @ 2402c9ad
......@@ -1083,3 +1083,4 @@ fa:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/fi.yml
View file @ 2402c9ad
......@@ -1102,3 +1102,4 @@ fi:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/fr.yml
View file @ 2402c9ad
......@@ -859,6 +859,7 @@ fr:
label_attribute_of_project: "%{name} du projet"
label_attribute_of_author: "%{name} de l'auteur"
label_attribute_of_assigned_to: "%{name} de l'assigné"
label_attribute_of_user: "%{name} de l'utilisateur"
label_attribute_of_fixed_version: "%{name} de la version cible"
label_cross_project_descendants: Avec les sous-projets
label_cross_project_tree: Avec tout l'arbre
......
config/locales/gl.yml
View file @ 2402c9ad
......@@ -1092,3 +1092,4 @@ gl:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/he.yml
View file @ 2402c9ad
......@@ -1086,3 +1086,4 @@ he:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/hr.yml
View file @ 2402c9ad
......@@ -1082,3 +1082,4 @@ hr:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/hu.yml
View file @ 2402c9ad
......@@ -1100,3 +1100,4 @@
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/id.yml
View file @ 2402c9ad
......@@ -1085,3 +1085,4 @@ id:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/it.yml
View file @ 2402c9ad
......@@ -1082,3 +1082,4 @@ it:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/ja.yml
View file @ 2402c9ad
......@@ -1111,3 +1111,4 @@ ja:
setting_non_working_week_days: 休業日
label_in_the_next_days: 今後○日
label_in_the_past_days: 過去○日
label_attribute_of_user: User's %{name}
config/locales/ko.yml
View file @ 2402c9ad
......@@ -1131,3 +1131,4 @@ ko:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/lt.yml
View file @ 2402c9ad
......@@ -1140,3 +1140,4 @@ lt:
setting_non_working_week_days: Nedarbo dienos
label_in_the_next_days: per ateinančias
label_in_the_past_days: per paskutines
label_attribute_of_user: User's %{name}
config/locales/lv.yml
View file @ 2402c9ad
......@@ -1075,3 +1075,4 @@ lv:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/mk.yml
View file @ 2402c9ad
......@@ -1081,3 +1081,4 @@ mk:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/mn.yml
View file @ 2402c9ad
......@@ -1082,3 +1082,4 @@ mn:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/nl.yml
View file @ 2402c9ad
......@@ -1063,3 +1063,4 @@ nl:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/no.yml
View file @ 2402c9ad
......@@ -1071,3 +1071,4 @@
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/pl.yml
View file @ 2402c9ad
......@@ -1098,3 +1098,4 @@ pl:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/pt-BR.yml
View file @ 2402c9ad
......@@ -1102,3 +1102,4 @@ pt-BR:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/pt.yml
View file @ 2402c9ad
......@@ -1086,3 +1086,4 @@ pt:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/ro.yml
View file @ 2402c9ad
......@@ -1078,3 +1078,4 @@ ro:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/ru.yml
View file @ 2402c9ad
......@@ -1194,3 +1194,4 @@ ru:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/sk.yml
View file @ 2402c9ad
......@@ -1081,3 +1081,4 @@ sk:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/sl.yml
View file @ 2402c9ad
......@@ -1081,3 +1081,4 @@ sl:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/sq.yml
View file @ 2402c9ad
......@@ -1077,3 +1077,4 @@ sq:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/sr-YU.yml
View file @ 2402c9ad
......@@ -1083,3 +1083,4 @@ sr-YU:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/sr.yml
View file @ 2402c9ad
......@@ -1082,3 +1082,4 @@ sr:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/sv.yml
View file @ 2402c9ad
......@@ -1119,3 +1119,4 @@ sv:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/th.yml
View file @ 2402c9ad
......@@ -1078,3 +1078,4 @@ th:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/tr.yml
View file @ 2402c9ad
......@@ -1100,3 +1100,4 @@ tr:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/uk.yml
View file @ 2402c9ad
......@@ -1076,3 +1076,4 @@ uk:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/vi.yml
View file @ 2402c9ad
......@@ -1132,3 +1132,4 @@ vi:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
config/locales/zh-TW.yml
View file @ 2402c9ad
......@@ -1162,3 +1162,4 @@
description_date_from: 輸入起始日期
description_date_to: 輸入結束日期
text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
label_attribute_of_user: User's %{name}
config/locales/zh.yml
View file @ 2402c9ad
......@@ -1085,3 +1085,4 @@ zh:
setting_non_working_week_days: Non-working days
label_in_the_next_days: in the next
label_in_the_past_days: in the past
label_attribute_of_user: User's %{name}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment