diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-03 08:04:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-03 08:04:13 +0000 |
| commit | 44c748f968f6a82e6dab444e6b9127f5a342f0e2 (patch) | |
| tree | 1b10207d8d1198cf6cb2d6f731d14ca5a824e02d /app/controllers | |
| parent | f6defca16de748d8481dd857b31322eec0162b20 (diff) | |
| download | redmine-44c748f968f6a82e6dab444e6b9127f5a342f0e2.tar.gz redmine-44c748f968f6a82e6dab444e6b9127f5a342f0e2.zip | |
Use regular instance methods instead of association extensions.
Rails 5.1 seems to mess things up in this particular case (role.workflow_rules.copy calls the extension declare in Tracker model).
git-svn-id: http://svn.redmine.org/redmine/trunk@16597 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/roles_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/trackers_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index d134e1f67..6071e767b 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -60,7 +60,7 @@ class RolesController < ApplicationController if request.post? && @role.save # workflow copy if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from])) - @role.workflow_rules.copy(copy_from) + @role.copy_workflow_rules(copy_from) end flash[:notice] = l(:notice_successful_create) redirect_to roles_path diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 5bae880d1..c624133a7 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -44,7 +44,7 @@ class TrackersController < ApplicationController if @tracker.save # workflow copy if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from])) - @tracker.workflow_rules.copy(copy_from) + @tracker.copy_workflow_rules(copy_from) end flash[:notice] = l(:notice_successful_create) redirect_to trackers_path |