From 19bd581ffd528b8c8de5384f2a46c9cdccfce184 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 15 Nov 2016 12:18:16 -0600 Subject: [PATCH] Prefer local_prefixes over the private _prefixes method --- .../concerns/sufia/batch_edits_controller_behavior.rb | 3 ++- .../concerns/sufia/file_sets_controller_behavior.rb | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb b/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb index d5c99b8a14..80d92040ab 100644 --- a/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb +++ b/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb @@ -48,7 +48,8 @@ def add_breadcrumb_for_controller end def _prefixes - # This allows us to use the templates in curation_concerns/base + # This allows us to use the templates in curation_concerns/base, while prefering + # our local paths. Thus we are unable to just override `self.local_prefixes` @_prefixes ||= super + ['curation_concerns/base'] end diff --git a/app/controllers/concerns/sufia/file_sets_controller_behavior.rb b/app/controllers/concerns/sufia/file_sets_controller_behavior.rb index 1fbe1da079..3b66738bb8 100644 --- a/app/controllers/concerns/sufia/file_sets_controller_behavior.rb +++ b/app/controllers/concerns/sufia/file_sets_controller_behavior.rb @@ -44,12 +44,12 @@ def add_breadcrumb_for_action end end - protected + # This allows us to use the templates in curation_concerns/file_sets + def self.local_prefixes + ['curation_concerns/file_sets'] + end - def _prefixes - # This allows us to use the templates in curation_concerns/file_sets - @_prefixes ||= ['curation_concerns/file_sets'] + super - end + protected def initialize_edit_form @version_list = version_list