Merge pull request #164 from CDRH/fix-overrides

Fix render_overridable
CDRH · Oct 25, 2019 · aad542d · aad542d
2 parents 9d9a873 + 7e5029f
commit aad542d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -39,9 +39,14 @@ def render_overridable(path="", view="", **kwargs)
     # False when looking for views rather than partials
     is_partial = false
 
-    if @section.present? && lookup_context.template_exists?(view,
-      "#{@section}/#{path}", is_partial)
+    if @section.present? && path.is_a?(String) &&
+      lookup_context.template_exists?(view, "#{@section}/#{path}",
+                                      is_partial)
       path = "#{@section}/#{path}"
+    elsif @section.present? && path.is_a?(Array) &&
+      lookup_context.template_exists?(view, "#{@section}/#{path[0]}",
+                                      is_partial)
+      path = "#{@section}/#{path[0]}"
     elsif !lookup_context.template_exists?(view, path, is_partial)
       # Log error and display 404 view if view is missing
       path << "/" if path.present?

diff --git a/app/helpers/orchid/application_helper.rb b/app/helpers/orchid/application_helper.rb
@@ -210,9 +210,15 @@ def render_overridable(path="", partial="", **kwargs)
 
     # True when looking for partials rather than views
     is_partial = true
-    if @section.present? && lookup_context.template_exists?(partial,
-      "#{@section}/#{path}", is_partial)
+
+    if @section.present? && path.is_a?(String) &&
+      lookup_context.template_exists?(partial, "#{@section}/#{path}",
+                                      is_partial)
       path = "#{@section}/#{path}"
+    elsif @section.present? && path.is_a?(Array) &&
+      lookup_context.template_exists?(partial, "#{@section}/#{path[0]}",
+                                      is_partial)
+      path = "#{@section}/#{path[0]}"
     elsif !lookup_context.template_exists?(partial, path, is_partial)
       # fallback to informative partial about customization
       path << "/" if path.present?