Merge pull request #52 from centosadmin/develop

Develop

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.1
+
+* Add copy status setting
+
 # 0.3.0
 
 * Improve errors handling

app/models/recurring_task.rb

@@ -85,12 +85,14 @@ def self.schedules(current_time = Time.now)
   def copy_issue(associations = [])
     return if issue.project.archived? || issue.project.closed?
 
+    settings = Setting.find_by(name: :plugin_redmine_recurring_tasks)&.value || {}
+
     issue.deep_clone(include: associations, except: %i[parent_id root_id lft rgt created_on updated_on closed_on]) do |original, copy|
       case original
       when Issue
         copy.init_journal(original.author)
         new_author =
-          if Setting.plugin_redmine_recurring_tasks['use_anonymous_user']
+          if settings['use_anonymous_user']
             User.anonymous
           else
             unless original.author.allowed_to?(:copy_issues, issue.project)
@@ -102,7 +104,15 @@ def copy_issue(associations = [])
         copy.author_id = new_author.id
         copy.tracker_id = original.tracker_id
         copy.parent_issue_id = original.parent_id
-        copy.status = copy.new_statuses_allowed_to(original.author).first
+        copy.status_id =
+          case settings['copied_issue_status']
+          when nil
+            copy.new_statuses_allowed_to(original.author).sort_by(&:position).first&.id
+          when '0'
+            original.status_id
+          else
+            settings['copied_issue_status']
+          end
         copy.attachments = original.attachments.map do |attachement|
           attachement.copy(container: original)
         end

app/views/settings/_redmine_recurring_tasks.html.erb

@@ -11,6 +11,13 @@
 <p>
   <%= button_tag l(:button_reset), type: :button, onClick: '$("#settings_associations option:selected").prop("selected", false);' %>
 </p>
+
+<p>
+  <%= label_tag 'settings[copied_issue_status]', l(:settings_copied_issue_status) %>
+  <%= select_tag 'settings[copied_issue_status]',
+                 options_for_select([[l(:settings_copy_from_original), 0], *IssueStatus.sorted.map { |status| [status.name, status.id] }], @settings[:copied_issue_status]),
+                 include_blank: true %>
+</p>
 <p>
   <%= label_tag 'settings[use_anonymous_user]', l(:settings_use_anonymous_user) %>
   <%= check_box_tag 'settings[use_anonymous_user]', 1, @settings[:use_anonymous_user] %>

config/locales/en.yml

@@ -21,3 +21,5 @@ en:
   settings_associations: Issue associations to copy
   settings_associations_warning: Warning! Incorrect settings may break plugin work. In case of problem try to turn off all options.
   settings_use_anonymous_user: Use anonymous user while copying issues
+  settings_copied_issue_status: Copied issues status
+  settings_copy_from_original: Copy from original issue

config/locales/ru.yml

@@ -17,6 +17,8 @@ ru:
   settings_associations: Связи для копирования
   settings_associations_warning: Внимание! Некорректные настройки могут нарушить корректную работу плагина. При возникновении проблем попробуйте снять все опции.
   settings_use_anonymous_user: Использовать анонимного пользователя для создания задач
+  settings_copied_issue_status: Статус задач-копий
+  settings_copy_from_original: Копировать из оригинала
 
   activerecord:
     attributes:

init.rb

@@ -14,7 +14,7 @@
   name 'Redmine Recurring Tasks'
   author 'Southbridge'
   description 'Plugin for creating scheduled tasks from template'
-  version '0.3.0'
+  version '0.3.1'
   url 'https://github.com/centosadmin/redmine_recurring_tasks'
   author_url 'https://github.com/centosadmin'