From 9dd5f3f15432c5447b56189fc9081d05d8f7f287 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Thu, 15 Sep 2016 09:48:49 -0400 Subject: [PATCH] Include the bare partial in document partial lookups and use the bare name by default --- app/helpers/blacklight/render_partials_helper_behavior.rb | 3 ++- .../{_document_default.atom.builder => _document.atom.builder} | 0 .../{_document_default.rss.builder => _document.rss.builder} | 0 app/views/catalog/{_group_default.html.erb => _group.html.erb} | 0 app/views/catalog/{_index_default.html.erb => _index.html.erb} | 0 .../{_index_header_default.html.erb => _index_header.html.erb} | 0 app/views/catalog/{_show_default.html.erb => _show.html.erb} | 0 .../{_show_header_default.html.erb => _show_header.html.erb} | 0 .../{_thumbnail_default.html.erb => _thumbnail.html.erb} | 0 .../{_index_default.erb_spec.rb => _index.html.erb_spec.rb} | 2 +- ...default.html.erb_spec.rb => _index_header.html.erb_spec.rb} | 0 .../{_show_default.erb_spec.rb => _show.html.erb_spec.rb} | 2 +- ...umbnail_default.erb_spec.rb => _thumbnail.html.erb_spec.rb} | 0 13 files changed, 4 insertions(+), 3 deletions(-) rename app/views/catalog/{_document_default.atom.builder => _document.atom.builder} (100%) rename app/views/catalog/{_document_default.rss.builder => _document.rss.builder} (100%) rename app/views/catalog/{_group_default.html.erb => _group.html.erb} (100%) rename app/views/catalog/{_index_default.html.erb => _index.html.erb} (100%) rename app/views/catalog/{_index_header_default.html.erb => _index_header.html.erb} (100%) rename app/views/catalog/{_show_default.html.erb => _show.html.erb} (100%) rename app/views/catalog/{_show_header_default.html.erb => _show_header.html.erb} (100%) rename app/views/catalog/{_thumbnail_default.html.erb => _thumbnail.html.erb} (100%) rename spec/views/catalog/{_index_default.erb_spec.rb => _index.html.erb_spec.rb} (97%) rename spec/views/catalog/{_index_header_default.html.erb_spec.rb => _index_header.html.erb_spec.rb} (100%) rename spec/views/catalog/{_show_default.erb_spec.rb => _show.html.erb_spec.rb} (97%) rename spec/views/catalog/{_thumbnail_default.erb_spec.rb => _thumbnail.html.erb_spec.rb} (100%) diff --git a/app/helpers/blacklight/render_partials_helper_behavior.rb b/app/helpers/blacklight/render_partials_helper_behavior.rb index b628a2eed3..23a97d3b7a 100644 --- 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/app/views/catalog/_document_default.atom.builder b/app/views/catalog/_document.atom.builder similarity index 100% rename from app/views/catalog/_document_default.atom.builder rename to app/views/catalog/_document.atom.builder diff --git a/app/views/catalog/_document_default.rss.builder b/app/views/catalog/_document.rss.builder similarity index 100% rename from app/views/catalog/_document_default.rss.builder rename to app/views/catalog/_document.rss.builder diff --git a/app/views/catalog/_group_default.html.erb b/app/views/catalog/_group.html.erb similarity index 100% rename from app/views/catalog/_group_default.html.erb rename to app/views/catalog/_group.html.erb diff --git a/app/views/catalog/_index_default.html.erb b/app/views/catalog/_index.html.erb similarity index 100% rename from app/views/catalog/_index_default.html.erb rename to app/views/catalog/_index.html.erb diff --git a/app/views/catalog/_index_header_default.html.erb b/app/views/catalog/_index_header.html.erb similarity index 100% rename from app/views/catalog/_index_header_default.html.erb rename to app/views/catalog/_index_header.html.erb diff --git a/app/views/catalog/_show_default.html.erb b/app/views/catalog/_show.html.erb similarity index 100% rename from app/views/catalog/_show_default.html.erb rename to app/views/catalog/_show.html.erb diff --git a/app/views/catalog/_show_header_default.html.erb b/app/views/catalog/_show_header.html.erb similarity index 100% rename from app/views/catalog/_show_header_default.html.erb rename to app/views/catalog/_show_header.html.erb diff --git a/app/views/catalog/_thumbnail_default.html.erb b/app/views/catalog/_thumbnail.html.erb similarity index 100% rename from app/views/catalog/_thumbnail_default.html.erb rename to app/views/catalog/_thumbnail.html.erb diff --git a/spec/views/catalog/_index_default.erb_spec.rb b/spec/views/catalog/_index.html.erb_spec.rb similarity index 97% rename from spec/views/catalog/_index_default.erb_spec.rb rename to spec/views/catalog/_index.html.erb_spec.rb index 668f40f8d4..eefcc4d0f9 100644 --- a/spec/views/catalog/_index_default.erb_spec.rb +++ b/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/spec/views/catalog/_index_header_default.html.erb_spec.rb b/spec/views/catalog/_index_header.html.erb_spec.rb similarity index 100% rename from spec/views/catalog/_index_header_default.html.erb_spec.rb rename to spec/views/catalog/_index_header.html.erb_spec.rb diff --git a/spec/views/catalog/_show_default.erb_spec.rb b/spec/views/catalog/_show.html.erb_spec.rb similarity index 97% rename from spec/views/catalog/_show_default.erb_spec.rb rename to spec/views/catalog/_show.html.erb_spec.rb index 8a5bb62238..bcf8b50c9a 100644 --- a/spec/views/catalog/_show_default.erb_spec.rb +++ b/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/spec/views/catalog/_thumbnail_default.erb_spec.rb b/spec/views/catalog/_thumbnail.html.erb_spec.rb similarity index 100% rename from spec/views/catalog/_thumbnail_default.erb_spec.rb rename to spec/views/catalog/_thumbnail.html.erb_spec.rb