breakout ancestors/descendants into their own partials, updating desc…

…endants i18n key
geoblacklight · Oct 20, 2016 · 54f5f29 · 54f5f29
1 parent bb31179
commit 54f5f29
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 28 deletions.
diff --git a/app/views/relation/_ancestors.html.erb b/app/views/relation/_ancestors.html.erb
@@ -0,0 +1,8 @@
+<b><%= t('geoblacklight.relations.ancestor') %></b>
+<% @relations.ancestors['docs'].each do |ancestor| %>
+  <li>
+    <%= link_to solr_document_path(ancestor['layer_slug_s']) do %>
+      <span class='geoblacklight geoblacklight-relations-ancestor'></span> <%= ancestor['dc_title_s'] %>
+    <% end %>
+  </li>
+<% end %>
diff --git a/app/views/relation/_descendants.html.erb b/app/views/relation/_descendants.html.erb
@@ -0,0 +1,15 @@
+<b><%= t('geoblacklight.relations.descendant', count: @relations.descendants['numFound']) %></b>
+<% @relations.descendants['docs'][0..2].each do |descendant| %>
+  <li>
+    <%= link_to solr_document_path(descendant['layer_slug_s']) do %>
+      <span class='geoblacklight geoblacklight-relations-descendant'></span> <%= descendant['dc_title_s'] %>
+    <% end %>
+  </li>
+<% end %>
+<% unless (@relations.descendants['numFound'].to_i <= 3) %>
+  <li>
+    <%= link_to search_catalog_path({f: {"#{Settings.FIELDS.SOURCE}" => [@relations.search_id]}}) do %>
+      <%= t('geoblacklight.relations.browse_all', count: @relations.descendants['numFound']) %>
+    <% end %>
+  </li>
+<% end %>
diff --git a/app/views/relation/index.html.erb b/app/views/relation/index.html.erb
@@ -5,33 +5,8 @@
     </div>
     <div class="panel-body">
       <ul class="nav">
-        <% unless (@relations.ancestors['numFound'].to_i == 0) %>
-          <b><%= t('geoblacklight.relations.ancestor') %></b>
-          <% @relations.ancestors['docs'].each do |ancestor| %>
-            <li>
-              <%= link_to solr_document_path(ancestor['layer_slug_s']) do %>
-                <span class='geoblacklight geoblacklight-relations-ancestor'></span> <%= ancestor['dc_title_s'] %>
-              <% end %>
-            </li>
-          <% end %>
-        <% end %>
-        <% unless (@relations.descendants['numFound'].to_i == 0) %>
-          <b><%= t('geoblacklight.relations.descendant') %>(<%= @relations.descendants['numFound'] %>)</b>
-          <% @relations.descendants['docs'][0..2].each do |descendant| %>
-            <li>
-              <%= link_to solr_document_path(descendant['layer_slug_s']) do %>
-                <span class='geoblacklight geoblacklight-relations-descendant'></span> <%= descendant['dc_title_s'] %>
-              <% end %>
-            </li>
-          <% end %>
-          <% unless (@relations.descendants['numFound'].to_i <= 3) %>
-            <li>
-              <%= link_to search_catalog_path({f: {"#{Settings.FIELDS.SOURCE}" => [@relations.search_id]}}) do %>
-                <%= t('geoblacklight.relations.browse_all', count:@relations.descendants['numFound']) %>
-              <% end %>
-            </li>
-          <% end %>
-        <% end %>
+        <%= render 'ancestors' unless @relations.ancestors['numFound'].to_i == 0 %>
+        <%= render 'descendants' unless @relations.descendants['numFound'].to_i == 0 %>
       </ul>
     </div>
   </div>

diff --git a/app/views/relation/index.json.jbuilder b/app/views/relation/index.json.jbuilder
@@ -1,2 +1,3 @@
 json.ancestors@relations.ancestors
 json.descendants @relations.descendants
+json.current_doc @relations.search_id
diff --git a/config/locales/geoblacklight.en.yml b/config/locales/geoblacklight.en.yml
@@ -34,6 +34,6 @@ en:
       data_dictionary: 'Documentation'
     relations:
       ancestor: 'Source Datasets'
-      descendant: 'Derived Datasets'
+      descendant: 'Derived Datasets (%{count})'
       browse_all: "Browse all %{count} records..."
       title: 'Data Relations'