From 554f4b5142147eed445bad5efaf367d5b5b8df2d Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:30:34 -0400 Subject: [PATCH 01/15] #54 creating a settings structure --- app/views/settings/_recurring_tasks_settings.html.erb | 8 ++++++++ config/locales/de.yml | 3 +++ config/locales/en.yml | 4 +++- config/locales/fr.yml | 3 +++ config/locales/ru.yml | 3 +++ config/locales/zh.yml | 3 +++ init.rb | 6 ++++++ 7 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/views/settings/_recurring_tasks_settings.html.erb diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb new file mode 100644 index 0000000..fc1038a --- /dev/null +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -0,0 +1,8 @@ + + + + + + + +
<%=l(:label_recurring_tasks_setting_show_top_menu)%><%= check_box 'settings', 'show_top_menu' %>
diff --git a/config/locales/de.yml b/config/locales/de.yml index 3a50f73..4f7d278 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -35,3 +35,6 @@ de: recurring_task_created: "Wiederholung wurde hinzugefügt. " recurring_task_saved: "Wiederholung wurde gespeichert. " recurring_task_removed: "Wiederholung wurde entfernt. " + + # settings (admins) + label_recurring_tasks_setting_show_top_menu: "Hauptmenü anzeigen?" diff --git a/config/locales/en.yml b/config/locales/en.yml index 21066d6..bedba87 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -41,9 +41,11 @@ en: month_modifier_dow_from_first: "on %{dows_from_bom} %{day_of_week}" month_modifier_dow_to_last: "on %{dows_to_eom} to last %{day_of_week}" - recurring_task_created: "Recurrence created. " recurring_task_saved: "Recurrence saved. " recurring_task_removed: "Recurrence removed. " help_add_general_recurring_task: "You may find it easier to add recurrence via the specific issue's page." + + # settings (admins) + label_recurring_tasks_setting_show_top_menu: "Display top menu?" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e7f449b..be98fa1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -45,3 +45,6 @@ fr: recurring_task_created: "Planification créée. " recurring_task_saved: "Planification sauvegardé. " recurring_task_removed: "Planification supprimée. " + + # settings (admins) + label_recurring_tasks_setting_show_top_menu: "Afficher menu principal?" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index de6e99b..561a9a3 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -35,3 +35,6 @@ ru: recurring_task_created: "Повторяющаяся задача создана. " recurring_task_saved: "Повторяющаяся задача сохранена. " recurring_task_removed: "Повторяющаяся задача удалена. " + + # settings (admins) + label_recurring_tasks_setting_show_top_menu: "отобразить главное меню?" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d20c94f..1f884d7 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -35,3 +35,6 @@ zh: recurring_task_created: "Recurrence created. " recurring_task_saved: "Recurrence saved. " recurring_task_removed: "Recurrence removed. " + + # settings (admins) + label_recurring_tasks_setting_show_top_menu: "显示顶部菜单?" diff --git a/init.rb b/init.rb index 6fa9be9..2ec667b 100644 --- a/init.rb +++ b/init.rb @@ -12,6 +12,12 @@ description 'Allows you to set a task to recur on a regular schedule, or when marked complete, regenerate a new task due in the future. Supports Redmine 2.x and 3.x' version '1.5.0' + # user-accessible global configuration + settings :default => { + 'show_top_menu' => true + }, :partial => 'settings/wiki_external_settings' + + Redmine::MenuManager.map :top_menu do |menu| menu.push :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => :label_recurring_tasks, :if => Proc.new { User.current.admin? } end From b8630ebd6f9b10ae8b1ae545b9cc66f5b0c8b8fd Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:32:58 -0400 Subject: [PATCH 02/15] #54 settings typo --- init.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.rb b/init.rb index 2ec667b..65ca4a5 100644 --- a/init.rb +++ b/init.rb @@ -10,12 +10,12 @@ author_url 'https://github.com/nutso/' url 'https://github.com/nutso/redmine-plugin-recurring-tasks' description 'Allows you to set a task to recur on a regular schedule, or when marked complete, regenerate a new task due in the future. Supports Redmine 2.x and 3.x' - version '1.5.0' + version '1.6.0' # user-accessible global configuration settings :default => { 'show_top_menu' => true - }, :partial => 'settings/wiki_external_settings' + }, :partial => 'settings/recurring_tasks_settings' Redmine::MenuManager.map :top_menu do |menu| From 31dfab9a69d70b1eb68c8ced4a778ec4c68abf32 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:39:46 -0400 Subject: [PATCH 03/15] #54 checkbox won't work, trying ddl --- app/views/settings/_recurring_tasks_settings.html.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index fc1038a..02dd1c5 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -2,7 +2,12 @@ <%=l(:label_recurring_tasks_setting_show_top_menu)%> - <%= check_box 'settings', 'show_top_menu' %> + + + From 239c2d5a6827658c66a7360131e32c3c585530ad Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:41:11 -0400 Subject: [PATCH 04/15] #54 checkbox won't work, trying ddl --- app/views/settings/_recurring_tasks_settings.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index 02dd1c5..3f2d5c7 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -4,8 +4,8 @@ <%=l(:label_recurring_tasks_setting_show_top_menu)%> From 220213154c5932119b2da0325eb32d378df9e89e Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:42:19 -0400 Subject: [PATCH 05/15] #54 syntax derp --- app/views/settings/_recurring_tasks_settings.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index 3f2d5c7..1eaca76 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -4,8 +4,8 @@ <%=l(:label_recurring_tasks_setting_show_top_menu)%> From 4712ecc6350e6a991ca0a6e4b502b967474b5c69 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:43:24 -0400 Subject: [PATCH 06/15] #54 setting to false? --- app/views/settings/_recurring_tasks_settings.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index 1eaca76..2065927 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -4,8 +4,8 @@ <%=l(:label_recurring_tasks_setting_show_top_menu)%> From 624e1fa59b3d75134626b5e08f6793ff36cf590d Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:44:50 -0400 Subject: [PATCH 07/15] #54 setting to false? --- app/views/settings/_recurring_tasks_settings.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index 2065927..8ca1518 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -4,8 +4,8 @@ <%=l(:label_recurring_tasks_setting_show_top_menu)%> From 883e61698f8ce0eae2018c4ade58448d00b08037 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:48:33 -0400 Subject: [PATCH 08/15] #54 updated proc to check for setting value --- init.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.rb b/init.rb index 65ca4a5..8c6561d 100644 --- a/init.rb +++ b/init.rb @@ -14,12 +14,12 @@ # user-accessible global configuration settings :default => { - 'show_top_menu' => true + 'show_top_menu' => "1" }, :partial => 'settings/recurring_tasks_settings' Redmine::MenuManager.map :top_menu do |menu| - menu.push :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => :label_recurring_tasks, :if => Proc.new { User.current.admin? } + menu.push :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => :label_recurring_tasks, :if => Proc.new { User.current.admin? && (Setting.plugin_recurring_tasks['show_top_menu'] == "1")} end # Permissions map to issue permissions (#12) From 76d5269ae16565b1566e923cae7610dfe0a963d9 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 11:49:59 -0400 Subject: [PATCH 09/15] #54 done, tested 2.x and 3.x --- ReleaseNotes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 7d7a341..4546706 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -5,7 +5,6 @@ * Option to 'predict' recurrences on calendar -- perhaps ghost the projected recurrences in ([#38](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/38)) * Option to re-open recurring issue instead of creating a new issue, so all comments/information are stored in a single place ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/45)); ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/74)) * Option to enable recurrence on a per-project basis ([#36](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/36)) -* Configurable option to hide the "Recurring issues" link in the admin menu ([#54](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/54)) ## Known Issues @@ -14,6 +13,8 @@ ## Next Version (Develop Branch) +* Configurable option to hide the "Recurring issues" link in the admin menu ([#54](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/54)) + ## Version 1.5.0 (13 June 2015) * Backwards-compatibility to Redmine 2.2 by testing if issue.closed_on? method exists ([#49](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/36)) From 7ee148fc7cd12acae00e5a5fd0c050d589b4417f Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 12:07:59 -0400 Subject: [PATCH 10/15] #45 #74 admin settings field and initial recurrence logic --- ReleaseNotes.md | 7 +++-- app/models/recurring_task.rb | 31 +++++++++++++------ .../_recurring_tasks_settings.html.erb | 9 ++++++ config/locales/en.yml | 1 + init.rb | 3 +- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 4546706..0dc9150 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -3,7 +3,6 @@ ## Features Requested * Option to 'predict' recurrences on calendar -- perhaps ghost the projected recurrences in ([#38](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/38)) -* Option to re-open recurring issue instead of creating a new issue, so all comments/information are stored in a single place ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/45)); ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/74)) * Option to enable recurrence on a per-project basis ([#36](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/36)) ## Known Issues @@ -13,6 +12,10 @@ ## Next Version (Develop Branch) +In Work +* Option to re-open recurring issue instead of creating a new issue, so all comments/information are stored in a single place ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/45)); ([#74](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/74)) + +Done * Configurable option to hide the "Recurring issues" link in the admin menu ([#54](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/54)) ## Version 1.5.0 (13 June 2015) @@ -33,7 +36,7 @@ * Russian translation contributed by @box789 ([#30](https://github.com/nutso/redmine-plugin-recurring-tasks/pull/30)) * French translation contributed by @jbeauvois ([#35](https://github.com/nutso/redmine-plugin-recurring-tasks/pull/35)) -* Backward Rails syntax compatibility ([#29](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/29), [#34](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/34)) +* Backward Rails syntax compatibility ([#29](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/29)), [#34](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/34)) * Deleting the source issue for a recurrence deletes the recurrence ([#33](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/33)) * Recurrence checks for nil issue before attempting to recur ([#33](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/33)) diff --git a/app/models/recurring_task.rb b/app/models/recurring_task.rb index 230d269..e34bf26 100644 --- a/app/models/recurring_task.rb +++ b/app/models/recurring_task.rb @@ -223,6 +223,10 @@ def next_scheduled_recurrence # whether a recurrence needs to be added def need_to_recur? + # ensuring we don't have an infinite loop + # if the setting is to reopen issues on recurrence, then if the issue is open, no recurrence is needed + return false if(Setting.plugin_recurring_tasks['reopen_issue'] == "1" && !issue.closed?) + # 41 # if(fixed_schedule and (previous_date_for_recurrence + recurrence_pattern) <= (Time.now.to_date + 1.day)) then true else issue.closed? end if fixed_schedule @@ -244,26 +248,33 @@ def recur_issue_if_needed! # Add more than one recurrence to 'catch up' if warranted (issue #10) - while need_to_recur? - new_issue = issue.copy + while need_to_recur? + new_issue = issue # default to existing issue + if Setting.plugin_recurring_tasks['reopen_issue'] != "1" + # duplicate issue + new_issue = issue.copy + end new_issue.due_date = next_scheduled_recurrence #41 previous_date_for_recurrence + recurrence_pattern new_issue.start_date = new_issue.due_date new_issue.done_ratio = 0 - if issue.tracker.respond_to?(:default_status) - # Redmine 3 - new_issue.status = issue.tracker.default_status # issue status is NOT automatically new, default is whatever the default status for new issues is - else - # Redmine 2 - new_issue.status = IssueStatus.default - end + new_issue.status = recurring_issue_default_status new_issue.save! - puts "Recurring #{issue.id}: #{issue.subj_date}, created #{new_issue.id}: #{new_issue.subj_date}" + puts "Recurring #{issue.id}: #{issue.subj_date}, created or reopened #{new_issue.id}: #{new_issue.subj_date}" self.issue = new_issue save! end end + def recurring_issue_default_status + # issue status is NOT automatically new, default is whatever the default status for new issues is + + # Redmine 3 + return issue.tracker.default_status if issue.tracker.respond_to?(:default_status) + # Redmine 2 + IssueStatus.default + end + #41 def recurrence_to_s modifier = (interval_unit == INTERVAL_MONTH) ? " #{interval_localized_modifier}" : "" diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index 8ca1518..022fa76 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -9,5 +9,14 @@ + + <%=l(:label_recurring_tasks_setting_reopen_issue)%> + + + + diff --git a/config/locales/en.yml b/config/locales/en.yml index bedba87..fb69bf6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -49,3 +49,4 @@ en: # settings (admins) label_recurring_tasks_setting_show_top_menu: "Display top menu?" + label_recurring_tasks_setting_reopen_issue: "Reopen issue on recurrence?" diff --git a/init.rb b/init.rb index 8c6561d..a72e9ef 100644 --- a/init.rb +++ b/init.rb @@ -14,7 +14,8 @@ # user-accessible global configuration settings :default => { - 'show_top_menu' => "1" + 'show_top_menu' => "1", + 'reopen_issue' => "0" }, :partial => 'settings/recurring_tasks_settings' From e5c0511fbc3b7cdec9ef9a9bc5a39e92d793e861 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 12:23:12 -0400 Subject: [PATCH 11/15] #45 #74 adding journal entry --- app/models/recurring_task.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/recurring_task.rb b/app/models/recurring_task.rb index e34bf26..5fe4455 100644 --- a/app/models/recurring_task.rb +++ b/app/models/recurring_task.rb @@ -254,6 +254,7 @@ def recur_issue_if_needed! # duplicate issue new_issue = issue.copy end + issue.init_journal(nil) # system new_issue.due_date = next_scheduled_recurrence #41 previous_date_for_recurrence + recurrence_pattern new_issue.start_date = new_issue.due_date new_issue.done_ratio = 0 From 05190992972c86ffaa47e9e43a7646a7d43bfd81 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 12:31:08 -0400 Subject: [PATCH 12/15] #45 #74 configurable user to attribute journal entries to --- app/models/recurring_task.rb | 6 +++++- app/views/settings/_recurring_tasks_settings.html.erb | 4 ++++ config/locales/en.yml | 1 + init.rb | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/models/recurring_task.rb b/app/models/recurring_task.rb index 5fe4455..299891d 100644 --- a/app/models/recurring_task.rb +++ b/app/models/recurring_task.rb @@ -254,7 +254,11 @@ def recur_issue_if_needed! # duplicate issue new_issue = issue.copy end - issue.init_journal(nil) # system + + # if a journal user has been defined, create a journal + unless Setting.plugin_recurring_tasks['journal_attributed_to_user'].blank? + issue.init_journal(User.find(Setting.plugin_recurring_tasks['journal_attributed_to_user'])) + end new_issue.due_date = next_scheduled_recurrence #41 previous_date_for_recurrence + recurrence_pattern new_issue.start_date = new_issue.due_date new_issue.done_ratio = 0 diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index 022fa76..b3ca740 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -1,5 +1,9 @@ + + + + - + From 90a35f520af31db2b196c87ecf7de957f4927027 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 12:35:40 -0400 Subject: [PATCH 14/15] adding a note to flag journals from recurring --- app/models/recurring_task.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/recurring_task.rb b/app/models/recurring_task.rb index 299891d..da23cdb 100644 --- a/app/models/recurring_task.rb +++ b/app/models/recurring_task.rb @@ -257,7 +257,7 @@ def recur_issue_if_needed! # if a journal user has been defined, create a journal unless Setting.plugin_recurring_tasks['journal_attributed_to_user'].blank? - issue.init_journal(User.find(Setting.plugin_recurring_tasks['journal_attributed_to_user'])) + issue.init_journal(User.find(Setting.plugin_recurring_tasks['journal_attributed_to_user']), l(:label_recurring_task)) end new_issue.due_date = next_scheduled_recurrence #41 previous_date_for_recurrence + recurrence_pattern new_issue.start_date = new_issue.due_date From 574bda1478a0b7d4d725d3f1a4ca45dc88f1a96c Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 12:49:17 -0400 Subject: [PATCH 15/15] v1.6 documentation --- README.md | 6 ++++++ ReleaseNotes.md | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e2c0097..2919a4c 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,12 @@ You should now be able to see the plugin list in Administration -> Plugins. * Edit issue recurrence * Delete issue recurrence (additionally requires the user to be a project member or administrator) +3. Within the Administration/Plugins/Recurring Tasks configuration page in Redmine, you have the following global configuration options: + a. Attribute issue journals to user id (optional) -- if blank, no journal notes will be added on recurrence; otherwise, this should be the numeric Redmine user id to which all recurring + journal entries will be tied to. This can be helpful if you want to create a placeholder user account and see all recurrence history within Redmine. + b. Display top menu? -- defaults to yes for historical purposes; whether (for Redmine administrators) and Recurring tasks menu option should be displayed on the top menu. + c. Reopen issue on recurrence? -- defaults to no for historical purposes; whether to re-open an issue (yes) or clone to a new issue (no) when the issue is due to recur + ## Upgrade or Migrate Plugin Please check the Release Notes (ReleaseNotes.md) for substantive or breaking changes. diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 0dc9150..e94e0bb 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -7,16 +7,15 @@ ## Known Issues -* No ability to view historic recurrences +* No ability to view all historic recurrences * Deleting an issue does not provide a warning about deleting associated recurrences ## Next Version (Develop Branch) -In Work -* Option to re-open recurring issue instead of creating a new issue, so all comments/information are stored in a single place ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/45)); ([#74](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/74)) - Done * Configurable option to hide the "Recurring issues" link in the admin menu ([#54](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/54)) +* Option to re-open recurring issues instead of creating a new issue, so all comments/information are stored in a single place ([#45](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/45)); + ([#74](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/74)). ## Version 1.5.0 (13 June 2015)
<%=l(:label_recurring_tasks_setting_journal_user)%>
<%=l(:label_recurring_tasks_setting_show_top_menu)%> diff --git a/config/locales/en.yml b/config/locales/en.yml index fb69bf6..7a92c8d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -50,3 +50,4 @@ en: # settings (admins) label_recurring_tasks_setting_show_top_menu: "Display top menu?" label_recurring_tasks_setting_reopen_issue: "Reopen issue on recurrence?" + label_recurring_tasks_setting_journal_user: "Attribute issue journals to user id:" diff --git a/init.rb b/init.rb index a72e9ef..3b14f9c 100644 --- a/init.rb +++ b/init.rb @@ -15,7 +15,8 @@ # user-accessible global configuration settings :default => { 'show_top_menu' => "1", - 'reopen_issue' => "0" + 'reopen_issue' => "0", + 'journal_attributed_to_user' => 1 }, :partial => 'settings/recurring_tasks_settings' From 581aa277884d2949d7169f0423874961cb2ba333 Mon Sep 17 00:00:00 2001 From: Teresa Date: Sun, 14 Jun 2015 12:32:41 -0400 Subject: [PATCH 13/15] #45 #74 typo --- app/views/settings/_recurring_tasks_settings.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/settings/_recurring_tasks_settings.html.erb b/app/views/settings/_recurring_tasks_settings.html.erb index b3ca740..ccf1dbf 100644 --- a/app/views/settings/_recurring_tasks_settings.html.erb +++ b/app/views/settings/_recurring_tasks_settings.html.erb @@ -2,7 +2,7 @@
<%=l(:label_recurring_tasks_setting_journal_user)%>
<%=l(:label_recurring_tasks_setting_show_top_menu)%>