Include the bare partial in document partial lookups and use the bare…

… name by default
projectblacklight · Sep 15, 2016 · 9dd5f3f · 9dd5f3f
1 parent d986ca2
commit 9dd5f3f
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 3 deletions.
diff --git a/app/helpers/blacklight/render_partials_helper_behavior.rb b/app/helpers/blacklight/render_partials_helper_behavior.rb
@@ -14,7 +14,7 @@ def render_document_index documents = nil, locals = {}
   ##
   # Render the document index for a grouped response
   def render_grouped_document_index
-    render 'catalog/group_default'
+    render 'catalog/group'
   end
 
   ##
@@ -163,6 +163,7 @@ def document_partial_path_templates
         "%{action_name}_%{index_view_type}_default",
         "%{action_name}_%{format}",
         "%{action_name}_default",
+        "%{action_name}",
         "catalog/%{action_name}_%{format}",
         "catalog/_%{action_name}_partials/%{format}",
         "catalog/_%{action_name}_partials/default"

diff --git a/...ws/catalog/_document_default.atom.builder → app/views/catalog/_document.atom.builder b/...ws/catalog/_document_default.atom.builder → app/views/catalog/_document.atom.builder
diff --git a/...ews/catalog/_document_default.rss.builder → app/views/catalog/_document.rss.builder b/...ews/catalog/_document_default.rss.builder → app/views/catalog/_document.rss.builder
diff --git a/app/views/catalog/_group_default.html.erb → app/views/catalog/_group.html.erb b/app/views/catalog/_group_default.html.erb → app/views/catalog/_group.html.erb
diff --git a/app/views/catalog/_index_default.html.erb → app/views/catalog/_index.html.erb b/app/views/catalog/_index_default.html.erb → app/views/catalog/_index.html.erb
diff --git a/...ws/catalog/_index_header_default.html.erb → app/views/catalog/_index_header.html.erb b/...ws/catalog/_index_header_default.html.erb → app/views/catalog/_index_header.html.erb
diff --git a/app/views/catalog/_show_default.html.erb → app/views/catalog/_show.html.erb b/app/views/catalog/_show_default.html.erb → app/views/catalog/_show.html.erb
diff --git a/...ews/catalog/_show_header_default.html.erb → app/views/catalog/_show_header.html.erb b/...ews/catalog/_show_header_default.html.erb → app/views/catalog/_show_header.html.erb
diff --git a/...views/catalog/_thumbnail_default.html.erb → app/views/catalog/_thumbnail.html.erb b/...views/catalog/_thumbnail_default.html.erb → app/views/catalog/_thumbnail.html.erb
diff --git a/.../views/catalog/_index_default.erb_spec.rb → spec/views/catalog/_index.html.erb_spec.rb b/.../views/catalog/_index_default.erb_spec.rb → spec/views/catalog/_index.html.erb_spec.rb
@@ -2,7 +2,7 @@
 
 # spec for default partial to display solr document fields in catalog INDEX view
 
-describe "/catalog/_index_default.erb" do
+describe "/catalog/_index" do
   include BlacklightHelper
   include CatalogHelper
 

diff --git a/...og/_index_header_default.html.erb_spec.rb → ...ws/catalog/_index_header.html.erb_spec.rb b/...og/_index_header_default.html.erb_spec.rb → ...ws/catalog/_index_header.html.erb_spec.rb
diff --git a/spec/views/catalog/_show_default.erb_spec.rb → spec/views/catalog/_show.html.erb_spec.rb b/spec/views/catalog/_show_default.erb_spec.rb → spec/views/catalog/_show.html.erb_spec.rb
@@ -2,7 +2,7 @@
 
 # spec for default partial to display solr document fields in catalog show view
 
-describe "/catalog/_show_default.html.erb" do
+describe "/catalog/_show" do
 
   include BlacklightHelper
   include CatalogHelper

diff --git a/...ws/catalog/_thumbnail_default.erb_spec.rb → ...views/catalog/_thumbnail.html.erb_spec.rb b/...ws/catalog/_thumbnail_default.erb_spec.rb → ...views/catalog/_thumbnail.html.erb_spec.rb