diff options
| author | cedricnjanga | 2018-05-09 21:36:48 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-05-09 21:36:48 -0700 |
| commit | 2666086123e19b657bfef20d2032924566befd48 (patch) | |
| tree | 5db21c7c0c16c57b5235dbfb48f45c9c19cce512 /app | |
| parent | fdde7e05c29738356abe488a1b80ade098ef269d (diff) | |
| download | chouette-core-6668-merges-controller-current-organization.tar.bz2 | |
Refs #6668 add begin_of_association_chain for merges controller6668-merges-controller-current-organization
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/merges_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb index 663b6e750..99adadafb 100644 --- a/app/controllers/merges_controller.rb +++ b/app/controllers/merges_controller.rb @@ -8,6 +8,12 @@ class MergesController < ChouetteController before_action :set_mergeable_controllers, only: [:new] + protected + + def begin_of_association_chain + current_organisation + end + private def set_mergeable_controllers |