From 81a28e9ffa0d4a2279a6a2b19b3fd60f12ccdd31 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Barth Date: Sat, 18 Sep 2010 17:30:22 +0000 Subject: [PATCH 1/8] Adds a link to edit the associated wiki page on the version view. #4416 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4101 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/versions/show.rhtml | 1 + config/locales/bg.yml | 1 + config/locales/bs.yml | 1 + config/locales/ca.yml | 1 + config/locales/cs.yml | 1 + config/locales/da.yml | 1 + config/locales/de.yml | 1 + config/locales/el.yml | 1 + config/locales/en-GB.yml | 1 + config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/eu.yml | 1 + config/locales/fi.yml | 1 + config/locales/fr.yml | 1 + config/locales/gl.yml | 1 + config/locales/he.yml | 1 + config/locales/hr.yml | 1 + config/locales/hu.yml | 1 + config/locales/id.yml | 1 + config/locales/it.yml | 1 + config/locales/ja.yml | 1 + config/locales/ko.yml | 1 + config/locales/lt.yml | 1 + config/locales/lv.yml | 1 + config/locales/mk.yml | 1 + config/locales/mn.yml | 1 + config/locales/nl.yml | 1 + config/locales/no.yml | 1 + config/locales/pl.yml | 1 + config/locales/pt-BR.yml | 1 + config/locales/pt.yml | 1 + config/locales/ro.yml | 1 + config/locales/ru.yml | 1 + config/locales/sk.yml | 1 + config/locales/sl.yml | 1 + config/locales/sr-YU.yml | 1 + config/locales/sr.yml | 1 + config/locales/sv.yml | 1 + config/locales/th.yml | 1 + config/locales/tr.yml | 1 + config/locales/uk.yml | 1 + config/locales/vi.yml | 1 + config/locales/zh-TW.yml | 1 + config/locales/zh.yml | 1 + 44 files changed, 44 insertions(+) diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 79de5984b..6b2b09d0f 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -1,5 +1,6 @@
<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %> +<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %> <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 0a8c427ef..ceee5c3cf 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -909,3 +909,4 @@ bg: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 741f46232..b855be9e9 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -929,3 +929,4 @@ bs: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 50a389156..6ba0a8bea 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -918,3 +918,4 @@ ca: field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 96fb608b6..71591fa46 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -915,3 +915,4 @@ cs: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/da.yml b/config/locales/da.yml index 38d9d6646..b6270f0d1 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -931,3 +931,4 @@ da: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/de.yml b/config/locales/de.yml index 5ec7073b3..3a5ee094e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -803,6 +803,7 @@ de: button_create_and_continue: Anlegen + nächstes Ticket button_test: Testen button_edit: Bearbeiten + button_edit_associated_wikipage: "Zugehörige Wikiseite bearbeiten: {{page_title}}" button_add: Hinzufügen button_change: Wechseln button_apply: Anwenden diff --git a/config/locales/el.yml b/config/locales/el.yml index 22bc6a459..d0608e851 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -915,3 +915,4 @@ el: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 8c0b28cf3..c0b520dfd 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -919,3 +919,4 @@ en-GB: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/en.yml b/config/locales/en.yml index cc4e31185..81a26c82c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -786,6 +786,7 @@ en: button_create_and_continue: Create and continue button_test: Test button_edit: Edit + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" button_add: Add button_change: Change button_apply: Apply diff --git a/config/locales/es.yml b/config/locales/es.yml index 3f848f1d1..1828558bf 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -955,3 +955,4 @@ es: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 24ef38ea7..64881fe6f 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -919,3 +919,4 @@ eu: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 985ab8b2a..8b56c94da 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -940,3 +940,4 @@ fi: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7f96b6112..0a1ee46ea 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -933,3 +933,4 @@ fr: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}" diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b717d8d60..b5345de69 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -931,3 +931,4 @@ gl: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/he.yml b/config/locales/he.yml index 86ebe7d3a..8c55b2351 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -920,3 +920,4 @@ he: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/hr.yml b/config/locales/hr.yml index f4a809a9a..77cda672a 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -922,3 +922,4 @@ hr: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index fe1abdf36..84e714a6b 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -938,3 +938,4 @@ project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/id.yml b/config/locales/id.yml index 7c327833f..ca6444b0c 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -923,3 +923,4 @@ id: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/it.yml b/config/locales/it.yml index 8d5aa4ef4..6bd4096a9 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -919,3 +919,4 @@ it: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 09eb36690..fa3346f17 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -940,3 +940,4 @@ ja: enumeration_doc_categories: 文書カテゴリ enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index eea667d62..771f91cef 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -971,3 +971,4 @@ ko: project_module_calendar: 달력 field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/lt.yml b/config/locales/lt.yml index b12a1107b..27c5466fd 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -979,3 +979,4 @@ lt: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 271140cce..5a628e5c5 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -910,3 +910,4 @@ lv: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/mk.yml b/config/locales/mk.yml index c98761865..ac2a043d4 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -915,3 +915,4 @@ mk: field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/mn.yml b/config/locales/mn.yml index b92538a47..908e8a844 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -916,3 +916,4 @@ mn: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e13e67ddf..b5933d222 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -897,3 +897,4 @@ nl: project_module_calendar: Kalender field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/no.yml b/config/locales/no.yml index cc95dae7d..24be1a06e 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -906,3 +906,4 @@ project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 6621ad39e..aade4af0e 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -936,3 +936,4 @@ pl: project_module_calendar: Kalendarz field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 547074083..7fa9ae2f5 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -939,3 +939,4 @@ pt-BR: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 28822061a..9a7547ab4 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -923,3 +923,4 @@ pt: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 85fea1399..aac64cc2b 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -908,3 +908,4 @@ ro: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 806b5c0ac..68a8fa6ef 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1032,3 +1032,4 @@ ru: notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 3fd6c41b2..87c50e27a 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -910,3 +910,4 @@ sk: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 68d8bb089..3b579a824 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -911,3 +911,4 @@ sl: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index c2ac531c9..b48e90223 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -915,3 +915,4 @@ sr-YU: project_module_calendar: Kalendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 5b5dfd461..8282a37bf 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -916,3 +916,4 @@ sr: field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 8055c572d..28ce75e21 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -960,3 +960,4 @@ sv: enumeration_system_activity: Systemaktivitet field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/th.yml b/config/locales/th.yml index 3e855995f..859cf0f08 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -912,3 +912,4 @@ th: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 43871ffe9..9244d983d 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -938,3 +938,4 @@ tr: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 89901d1ea..eade7c4a2 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -911,3 +911,4 @@ uk: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 28351ed26..94fbad869 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -970,3 +970,4 @@ vi: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 8dab78787..26f23b7fa 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1000,3 +1000,4 @@ enumeration_system_activity: 系統活動 field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b882d277a..3b788860d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -933,3 +933,4 @@ zh: project_module_calendar: Calendar field_member_of_group: Member of Group field_assigned_to_role: Member of Role + button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" From 944d1a68bd23b722e84243fda7eda0e4a0a23459 Mon Sep 17 00:00:00 2001 From: Azamat Hackimov Date: Sun, 19 Sep 2010 12:00:23 +0000 Subject: [PATCH 2/8] Translations update * ru * zh-TW (#6365) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4102 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/locales/ru.yml | 2 +- config/locales/zh-TW.yml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 68a8fa6ef..827ed52ee 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -230,6 +230,7 @@ ru: button_delete: Удалить button_download: Загрузить button_edit: Редактировать + button_edit_associated_wikipage: "Редактировать связанную wiki-страницу: {{page_title}}" button_list: Список button_lock: Заблокировать button_login: Вход @@ -1032,4 +1033,3 @@ ru: notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 26f23b7fa..3cfa4248a 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -366,6 +366,7 @@ field_redirect_existing_links: 重新導向現有連結 field_estimated_hours: 預估工時 field_column_names: 欄位 + field_time_entries: 耗用工時 field_time_zone: 時區 field_searchable: 可用做搜尋條件 field_default_value: 預設值 @@ -378,8 +379,9 @@ field_group_by: 結果分組方式 field_sharing: 共用 field_parent_issue: 父工作項目 - field_time_entries: 耗用工時 - + field_member_of_group: 所屬群組 + field_assigned_to_role: 所屬角色 + setting_app_title: 標題 setting_app_subtitle: 副標題 setting_welcome_text: 歡迎詞 @@ -870,6 +872,7 @@ button_create_and_continue: 繼續建立 button_test: 測試 button_edit: 編輯 + button_edit_associated_wikipage: "編輯相關 Wiki 頁面: {{page_title}}" button_add: 新增 button_change: 修改 button_apply: 套用 @@ -998,6 +1001,4 @@ enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 - field_member_of_group: Member of Group - field_assigned_to_role: Member of Role - button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + From 09331ec432bc0b3b308ecd4f44e39dcccf670eb7 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:14 +0000 Subject: [PATCH 3/8] Turn on ssl Gravatars for all SSL requests. #5929 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4103 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index eecbc5b91..6ba40eb45 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -829,7 +829,7 @@ module ApplicationHelper # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe ') def avatar(user, options = { }) if Setting.gravatar_enabled? - options.merge!({:ssl => Setting.protocol == 'https', :default => Setting.gravatar_default}) + options.merge!({:ssl => (defined?(request) && request.ssl?), :default => Setting.gravatar_default}) email = nil if user.respond_to?(:mail) email = user.mail From 1809eefe4cd10b47c72bac3bed0c336ac0db206b Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:20 +0000 Subject: [PATCH 4/8] Use the correct local variables in the PDF export. #6382 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4104 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/export/pdf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 27905b2bb..c4a2c3d90 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -154,7 +154,7 @@ module Redmine if query.grouped? && (group = query.group_by_column.value(issue)) != previous_group pdf.SetFontStyle('B',9) pdf.Cell(277, row_height, - (group.blank? ? 'None' : group.to_s) + " (#{@issue_count_by_group[group]})", + (group.blank? ? 'None' : group.to_s) + " (#{query.issue_count_by_group[group]})", 1, 1, 'L') pdf.SetFontStyle('',8) previous_group = group @@ -255,7 +255,7 @@ module Redmine pdf.SetFontStyle('B',9) pdf.Cell(35,5, l(:field_description) + ":") pdf.SetFontStyle('',9) - pdf.MultiCell(155,5, @issue.description,"BR") + pdf.MultiCell(155,5, issue.description,"BR") pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY) pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY) From f62a1827f33f9d3d2fa5e990a9f6c9475d4bdc71 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:26 +0000 Subject: [PATCH 5/8] Updated issue delete confirmation when it has child issues. #6191 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 5 +++++ app/views/issues/_action_menu.rhtml | 2 +- config/locales/bg.yml | 1 + config/locales/bs.yml | 1 + config/locales/ca.yml | 1 + config/locales/cs.yml | 1 + config/locales/da.yml | 1 + config/locales/de.yml | 1 + config/locales/el.yml | 1 + config/locales/en-GB.yml | 1 + config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/eu.yml | 1 + config/locales/fi.yml | 1 + config/locales/fr.yml | 1 + config/locales/gl.yml | 1 + config/locales/he.yml | 1 + config/locales/hr.yml | 1 + config/locales/hu.yml | 1 + config/locales/id.yml | 1 + config/locales/it.yml | 1 + config/locales/ja.yml | 1 + config/locales/ko.yml | 1 + config/locales/lt.yml | 1 + config/locales/lv.yml | 1 + config/locales/mk.yml | 1 + config/locales/mn.yml | 1 + config/locales/nl.yml | 1 + config/locales/no.yml | 1 + config/locales/pl.yml | 1 + config/locales/pt-BR.yml | 1 + config/locales/pt.yml | 1 + config/locales/ro.yml | 1 + config/locales/ru.yml | 1 + config/locales/sk.yml | 1 + config/locales/sl.yml | 1 + config/locales/sr-YU.yml | 1 + config/locales/sr.yml | 1 + config/locales/sv.yml | 1 + config/locales/th.yml | 1 + config/locales/tr.yml | 1 + config/locales/uk.yml | 1 + config/locales/vi.yml | 1 + config/locales/zh-TW.yml | 1 + config/locales/zh.yml | 1 + 45 files changed, 49 insertions(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 2b7362589..c49952306 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -382,6 +382,11 @@ class Issue < ActiveRecord::Base done_date = start_date + ((due_date - start_date+1)* done_ratio/100).floor return done_date <= Date.today end + + # Does this issue have children? + def children? + !leaf? + end # Users the issue can be assigned to def assignable_users diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml index c5d17511a..30c63ec66 100644 --- a/app/views/issues/_action_menu.rhtml +++ b/app/views/issues/_action_menu.rhtml @@ -6,5 +6,5 @@ <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %> <%= link_to_if_authorized l(:button_copy), new_issue_move_path(:id => @issue, :copy_options => {:copy => 't'}), :class => 'icon icon-copy' %> <%= link_to_if_authorized l(:button_move), new_issue_move_path(:id => @issue), :class => 'icon icon-move' %> -<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> +<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %> diff --git a/config/locales/bg.yml b/config/locales/bg.yml index ceee5c3cf..e99da7062 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -910,3 +910,4 @@ bg: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/bs.yml b/config/locales/bs.yml index b855be9e9..bef17900e 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -930,3 +930,4 @@ bs: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 6ba0a8bea..38092a2a7 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -919,3 +919,4 @@ ca: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 71591fa46..d3cdae5ef 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -916,3 +916,4 @@ cs: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/da.yml b/config/locales/da.yml index b6270f0d1..25d288336 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -932,3 +932,4 @@ da: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/de.yml b/config/locales/de.yml index 3a5ee094e..f9847c3f5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -935,3 +935,4 @@ de: field_member_of_group: Member of Group field_assigned_to_role: Member of Role + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/el.yml b/config/locales/el.yml index d0608e851..2b6e3493d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -916,3 +916,4 @@ el: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index c0b520dfd..4f5aec111 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -920,3 +920,4 @@ en-GB: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/en.yml b/config/locales/en.yml index 81a26c82c..2930d8079 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -838,6 +838,7 @@ en: text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted." text_workflow_edit: Select a role and a tracker to edit the workflow text_are_you_sure: Are you sure ? + text_are_you_sure_with_children: "Delete issue and all child issues?" text_journal_changed: "{{label}} changed from {{old}} to {{new}}" text_journal_set_to: "{{label}} set to {{value}}" text_journal_deleted: "{{label}} deleted ({{old}})" diff --git a/config/locales/es.yml b/config/locales/es.yml index 1828558bf..18d56ae3e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -956,3 +956,4 @@ es: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 64881fe6f..983fe1482 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -920,3 +920,4 @@ eu: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 8b56c94da..ea14a5c0d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -941,3 +941,4 @@ fi: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0a1ee46ea..0654ee736 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -934,3 +934,4 @@ fr: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/gl.yml b/config/locales/gl.yml index b5345de69..5360095f6 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -932,3 +932,4 @@ gl: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/he.yml b/config/locales/he.yml index 8c55b2351..0129eff88 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -921,3 +921,4 @@ he: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 77cda672a..9219ac660 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -923,3 +923,4 @@ hr: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 84e714a6b..e099cb9bc 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -939,3 +939,4 @@ field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/id.yml b/config/locales/id.yml index ca6444b0c..185d4f21d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -924,3 +924,4 @@ id: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/it.yml b/config/locales/it.yml index 6bd4096a9..be0da6a48 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -920,3 +920,4 @@ it: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fa3346f17..2ea6b009f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -941,3 +941,4 @@ ja: enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 771f91cef..e4dc36fb6 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -972,3 +972,4 @@ ko: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 27c5466fd..40e58b980 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -980,3 +980,4 @@ lt: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5a628e5c5..6162f60ef 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -911,3 +911,4 @@ lv: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/mk.yml b/config/locales/mk.yml index ac2a043d4..fb2f78d29 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -916,3 +916,4 @@ mk: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 908e8a844..5358657eb 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -917,3 +917,4 @@ mn: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/nl.yml b/config/locales/nl.yml index b5933d222..071b3919e 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -898,3 +898,4 @@ nl: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/no.yml b/config/locales/no.yml index 24be1a06e..4b76683fc 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -907,3 +907,4 @@ field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/pl.yml b/config/locales/pl.yml index aade4af0e..b56fd71eb 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -937,3 +937,4 @@ pl: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 7fa9ae2f5..ee1aefac5 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -940,3 +940,4 @@ pt-BR: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 9a7547ab4..cb336e25a 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -924,3 +924,4 @@ pt: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ro.yml b/config/locales/ro.yml index aac64cc2b..2e8f7a1ca 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -909,3 +909,4 @@ ro: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 827ed52ee..08e1acb95 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1033,3 +1033,4 @@ ru: notice_unable_delete_time_entry: Невозможно удалить запись журнала. label_overall_spent_time: Всего затрачено времени + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 87c50e27a..37c5ea6b1 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -911,3 +911,4 @@ sk: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 3b579a824..6732ef98d 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -912,3 +912,4 @@ sl: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index b48e90223..d73fd0340 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -916,3 +916,4 @@ sr-YU: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 8282a37bf..1b6a8d334 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -917,3 +917,4 @@ sr: field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 28ce75e21..439f9c7cd 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -961,3 +961,4 @@ sv: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/th.yml b/config/locales/th.yml index 859cf0f08..bc936f709 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -913,3 +913,4 @@ th: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 9244d983d..4b0e6022c 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -939,3 +939,4 @@ tr: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/uk.yml b/config/locales/uk.yml index eade7c4a2..146454da4 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -912,3 +912,4 @@ uk: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 94fbad869..8cf978d09 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -971,3 +971,4 @@ vi: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 3cfa4248a..38efcfa9d 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1002,3 +1002,4 @@ enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 + text_are_you_sure_with_children: Delete issue and all child issues? diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 3b788860d..a7611bf1d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -934,3 +934,4 @@ zh: field_member_of_group: Member of Group field_assigned_to_role: Member of Role button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" + text_are_you_sure_with_children: Delete issue and all child issues? From e58513c9767a2eafb3a101b3e466e41a85918edd Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:32 +0000 Subject: [PATCH 6/8] Fix failing test. See http://ci.finn.de/builds/1-8-7_redmine-trunk_postgres/4100 Contributed by Holger Just git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4106 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/query_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index f737b2f0c..db6173bae 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -400,7 +400,7 @@ class QueryTest < ActiveSupport::TestCase [group1.name, group1.id], [group2.name, group2.id] ] - assert_equal expected_group_list, @query.available_filters["member_of_group"][:values] + assert_equal expected_group_list.sort, @query.available_filters["member_of_group"][:values].sort end end From 1a4f5e87f2839fa2260deefd4d9a5c992ef860fe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 02:55:37 +0000 Subject: [PATCH 7/8] Add scm.css to news pages to allow proper syntax highlighting. #6270 Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4107 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/news/edit.rhtml | 4 ++++ app/views/news/index.rhtml | 1 + 2 files changed, 5 insertions(+) diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml index 4be566e0b..04d64df1f 100644 --- a/app/views/news/edit.rhtml +++ b/app/views/news/edit.rhtml @@ -12,3 +12,7 @@ }, :accesskey => accesskey(:preview) %> <% end %>
+ +<% content_for :header_tags do %> + <%= stylesheet_link_tag 'scm' %> +<% end %> diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml index 8b7cc66e1..41e8bb355 100644 --- a/app/views/news/index.rhtml +++ b/app/views/news/index.rhtml @@ -45,6 +45,7 @@ <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> + <%= stylesheet_link_tag 'scm' %> <% end %> <% html_title(l(:label_news_plural)) -%> From 3bc29e29e091b56bcffeb07ffb9c37c328525f99 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 20 Sep 2010 15:13:48 +0000 Subject: [PATCH 8/8] Refactor: split NewsController#new into #new and #create methods. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4163 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/news_controller.rb | 12 +++++++++--- app/views/news/index.rhtml | 2 +- app/views/news/new.rhtml | 2 +- config/routes.rb | 2 +- lib/redmine.rb | 2 +- test/functional/news_controller_test.rb | 8 ++++---- test/integration/routing_test.rb | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 4d44158a4..f4e4b6559 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -18,9 +18,9 @@ class NewsController < ApplicationController default_search_scope :news model_object News - before_filter :find_model_object, :except => [:new, :index, :preview] - before_filter :find_project_from_association, :except => [:new, :index, :preview] - before_filter :find_project, :only => [:new, :preview] + before_filter :find_model_object, :except => [:new, :create, :index, :preview] + before_filter :find_project_from_association, :except => [:new, :create, :index, :preview] + before_filter :find_project, :only => [:new, :create, :preview] before_filter :authorize, :except => [:index, :preview] before_filter :find_optional_project, :only => :index accept_key_auth :index @@ -46,11 +46,17 @@ class NewsController < ApplicationController def new @news = News.new(:project => @project, :author => User.current) + end + + def create + @news = News.new(:project => @project, :author => User.current) if request.post? @news.attributes = params[:news] if @news.save flash[:notice] = l(:notice_successful_create) redirect_to :controller => 'news', :action => 'index', :project_id => @project + else + render :action => 'new' end end end diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml index 41e8bb355..2b53b7f72 100644 --- a/app/views/news/index.rhtml +++ b/app/views/news/index.rhtml @@ -7,7 +7,7 @@