]> source.dussan.org Git - redmine.git/commitdiff
Adds filters for custom fields related to the project and user of time entries (...
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 9 Dec 2012 19:25:03 +0000 (19:25 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 9 Dec 2012 19:25:03 +0000 (19:25 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10971 e93f8b46-1217-0410-a6f0-8f06a7374b81

48 files changed:
app/models/time_entry_query.rb
config/locales/ar.yml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/en.yml
config/locales/es.yml
config/locales/et.yml
config/locales/eu.yml
config/locales/fa.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mk.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sq.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml

index 4cb9932ec47cde185038e21798724b7104bc2392..60fc843124215ae642d566952a4e9edb907c9620 100644 (file)
@@ -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$/, ''))
index d1cbc1921372dbdba180c73cb2a67128637d25ca..e1e069a91de298b1da73af9ad0a6fef55ee400cc 100644 (file)
@@ -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}
index 59e4f5fdad56d66b99227cad29b6ec9c5c498ca1..8567b6362175612e14e5a808d6ab94ccae84853d 100644 (file)
@@ -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}
index 2e4d26f06ce6c8de6e4f36f3e5a1753401383aec..df51bb4a5cbaf77ce54dabb89b250fcdfa57dbd3 100644 (file)
@@ -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}
index e8b188a2c4d69f0a350b7caa85b2be5005a9c1dd..d64f21b9a44336f186130b313b5d0dde6090d28d 100644 (file)
@@ -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}
index 847563fd3ac4b07ee2df750a49287fe9860b3b26..0c5182eee50830c66b574e22ed6ae36033920248 100644 (file)
@@ -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}
index 84aaf4e4e754e1f585e7463c2378af7b34b9f66c..31d47f206fa871edf6f28da108c4434787843986 100644 (file)
@@ -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}
index b39b2a9512d9254d53366ee1dc620eff64690517..5fffb24aa5f6bafcca1398ec472298da26312e6c 100644 (file)
@@ -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}
index 59c61af30dc5a4a095c1a120a2991ed0b46658fb..6c85d359c2db5e774ba449cb58415ad0402a47ed 100644 (file)
@@ -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}
index 8f386251b36bce7c35e1ad9004f2ae5521ad1adb..d7a425f3f1b750219044a327eac0eda1c809f7ee 100644 (file)
@@ -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}
index ecd15a312c21fbfff7e2f0c3aec101518cfa89ff..1e359f63e10dc62bb475092b010f3fdc04ce9788 100644 (file)
@@ -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
index f66726dad5c02c86b2b0437d597fa95e06a2311c..0ec25d7278f3aedaf2807a7dfc61b2d5a217503e 100644 (file)
@@ -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}
index 57d838faa5419f011bc3cdac1062ae980b60080e..bd8cf0ccea0ed6406367f4cbda8b1736e348bb9c 100644 (file)
@@ -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}
index 9a2aa1cff3487c2e4040b030219ac1bf0966b363..0cf760e55440a3927955949e812c0e31f377bf87 100644 (file)
@@ -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}
index bab8e178dcc114acc5959010928ea8084ae3730a..c882c9a4aa440e148f347d4e39ea1d8140336df4 100644 (file)
@@ -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}
index 213b27a8fc0f02a5340b3540ffb6b6e7f736430a..33169f24cea9827388c0c49df1b540ff22014a10 100644 (file)
@@ -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}
index 7ef49321f985d25cf24049c4aa18d8d2bcf6bd82..398f1b3019995f105fe11b26c1769bdefd2fb743 100644 (file)
@@ -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
index ca7d3e521671b5abb224621efb0e4e76f7ba3568..42876603ea18059e27da21f0e07f1c248a3ee89e 100644 (file)
@@ -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}
index 2309de67c401f21886b963daa0e9dcaab5893aa2..7f49ac5e2eb220470f97b3a9f4e9e82654fef989 100644 (file)
@@ -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}
index bdf019d2015019f042eaf9269136d7032cec7e5e..82e969d87b64b76f452b6b5101766d7943eae3bb 100644 (file)
@@ -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}
index 8e9bbb3dcfed3f1c808818299e09a90619799f04..901f5f213229797b237531ef7bfe132c0eea0130 100644 (file)
   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}
index 44f270e87c46848eac916f9d4f25db7f055de7a6..6d76f16809eed6e62ac7159bd2a4679717a92b26 100644 (file)
@@ -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}
index 61ec242ab052add01b58c1183e51b25b8b445328..0d83e6e46240370781819660549cc713881c1151 100644 (file)
@@ -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}
index f46b3bea38ff93709a701e39dd6c24e2fa3287e4..5fe7e5cf392e43c4f667632e0867f3cceba56ca1 100644 (file)
@@ -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}
index 7243281fb132afdb8d966489c939a2cf029aacb0..d2d692472e4752212f1863a12d421811079dde47 100644 (file)
@@ -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}
index 340a0d876a9aca84c153e345d8958b3a6665bde9..190caa3adb2af6a8bafbb237b21f10470905fb99 100644 (file)
@@ -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}
index 5b251771522266fa36565199cb4f4e6d414e02a1..2bfbb2524cfe742bae5a930d2d72d11446a06fce 100644 (file)
@@ -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}
index 2ced4c343b567e309cea140ae21095967f66344d..5e078dfa1b877b14496cda3de03b5dd80f7c1a97 100644 (file)
@@ -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}
index 2594d4c7f300065b07d1c41cc592dfcc62b9e799..8fbe12a5d31720f5695b12834748ea7502401d49 100644 (file)
@@ -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}
index 87a67d26b6edc826b3722e17323fb25aeef622df..6f8aa6835bb28295a0db3120f4f27d242f40f9be 100644 (file)
@@ -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}
index 2d629ada80922c0b8733269fd4893948ae3219c5..a1fe6dd439d0953ebef331681101698a4aa3fe2d 100644 (file)
   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}
index ec67dfbfb50ef0c29fc03fc7a47d70f4af5351a8..3b0c350cff7a58864546ec0ad6385467aba9f46a 100644 (file)
@@ -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}
index f2dcbc2d6feac9c9a1d734ed0c425dfb4f708735..754d4d6bc78fe315404d70b9dc379b756b781e0b 100644 (file)
@@ -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}
index 30ea6176fa111d9d21b2432a70c9c9632cd042c1..d3e0f2719caeb0191417d5d708e48ed0dc80978e 100644 (file)
@@ -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}
index cf24e815cd3266db0e77521d29fd43b1e9051812..70f7d69045a8d1fe38c06ec48249cc0ed3d93497 100644 (file)
@@ -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}
index 0fc48ba383452f9ca83e34d70005451958568a52..5def59a21c6dff604641aedaf874e06d4815a54c 100644 (file)
@@ -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}
index f3b3b6184d101bb17d007fb64858040f3fd5095c..e3f666d3657f0233c7565c2b9d07a787f3d0ce2d 100644 (file)
@@ -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}
index 3994c0085feb1738569864d5fc8afdabf6141d7b..a0f0ee0e1ab36473270d48c34d5ff138fd6657de 100644 (file)
@@ -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}
index 1114986296a704c5ee5289269daf15e3ed363c72..4f75bbdf4e904dbca54c9b11dfac958e01ff2801 100644 (file)
@@ -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}
index 488c8c6d9443c18ff90aab987d571cb5ef47aa4f..018eb78a0927c035c41a255e4305e0a66dfb20d7 100644 (file)
@@ -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}
index 94198fdd24557edfbbb5d54d15a86306d8ebf190..9caeab46bc6172942e40e10a9b862511d3b76f71 100644 (file)
@@ -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}
index 27227ae38c24af44977d058d83920b12f671ea03..dd85c05bf8539eea24455fcc4f981ccbc519e1b3 100644 (file)
@@ -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}
index b253a82f63c374d70abb678a5446004a82eb954c..bbd8c33ec85ed8bae912b5993b9b9a4e5e734c7c 100644 (file)
@@ -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}
index b31dd8df3ae5014fb097cd32a90ea3631209532b..f85fb02986468617497731fdb9c8ea3ca3fd4048 100644 (file)
@@ -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}
index 4930ef2bbe3d4c819c6f32c3bc3e06085c449d2d..252d3e0641bdb3f60526b30c1063be5a54c30cad 100644 (file)
@@ -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}
index a253ca01bf4d73b49fc29d42360b6f2be0585b5b..9e99cb313034211dfa94f8e79e202a8ea71d4cc1 100644 (file)
@@ -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}
index 4cd62dbc070a5758f18dceb1ffe6e2509030cc01..eff896be93c05eb48921d3f0a58e2b3a28cb478f 100644 (file)
   description_date_from: 輸入起始日期
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+  label_attribute_of_user: User's %{name}
index 65c2a644ed8c50b227bfdcbc3940637adc988243..9567af6ff7df39da6a917b7ec96d1a5e1d5dac2b 100644 (file)
@@ -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}