Skip to content

Commit

Permalink
Adds a simple parent/child navigator for taxon names.
Browse files Browse the repository at this point in the history
  • Loading branch information
mjy committed Nov 14, 2014
1 parent cb71ca1 commit 75530c1
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 13 deletions.
9 changes: 8 additions & 1 deletion app/models/geographic_area.rb
Expand Up @@ -140,8 +140,15 @@ def self.countries

def self.find_for_autocomplete(params)
terms = params[:term].split
limit = 100
case params[:term].length
when 0..3
limit = 10
else
limit = 40
end
search_term = terms.collect { |t| "name LIKE '#{t}%'" }.join(" OR ")
where(search_term).includes(:parent, :geographic_area_type).order(:name)
where(search_term).includes(:parent, :geographic_area_type).order(:name).limit(limit)
end

def children_at_level1
Expand Down
28 changes: 18 additions & 10 deletions app/views/shared/data/_show.html.erb
@@ -1,29 +1,37 @@
<div class="flexbox">
<div class="flexbox" id="show">
<div class="item item1 one_fifth_width">

<h2> <%= model_name_title -%></h2>

<div>id: <%= object.id -%></div>
<%= forward_back_links(object) -%> <br>
<%= edit_object_link(object) -%> | <%= destroy_object_link(object) -%> <br>
<%= pin_item_to_pinboard_link(object, sessions_current_user) -%>
<br>
<%= add_alternate_value_link(object: object, user: sessions_current_user) -%>
<br>
<%= papertrail_link(object) -%>
<%= forward_back_links(object) -%> <br><br>

<%= yield :show_navigation -%>
</div>

<div class="item item2 half_width">
<h2> <%= object_tag(object) -%> </h2>
<%= render object_attributes_partial_path(object.metamorphosize) %>

<div class="attributes">
<%= render object_attributes_partial_path(object.metamorphosize) %>
<%= render partial: '/shared/data/show/housekeeping', locals: {object: object} -%>
<%= render(partial: '/shared/data/show/soft_validation', locals: {object: object}) if object.class.respond_to?(:soft_validates?) -%>
<%= render(partial: '/notes/object_pane', locals: {object: object}) if object.respond_to?(:notes) %>
</div>
</div>

<div class="item item3 one_quarter_width">
<%= yield :editing -%>

<h3> Edit </h3>
<%= edit_object_link(object) -%> | <%= destroy_object_link(object) -%> <br>
<%= papertrail_link(object) -%>

<h3> Annotate </h3>
<%= add_alternate_value_link(object: object, user: sessions_current_user) -%><br>
<%= pin_item_to_pinboard_link(object, sessions_current_user) -%><br>

<%= yield :tasks -%>

</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/taxon_names/_attributes.html.erb
Expand Up @@ -27,7 +27,7 @@
<p>
<strong>Rank:</strong>
<%= @taxon_name.rank %>
(<%= @taxon_name.rank_class ? (@taxon_name.rank_class.nomenclatural_code.upcase) : content_tag(:em, 'ERROR') -%>)
(<%= @taxon_name.rank_class.nomenclatural_code ? (@taxon_name.rank_class.nomenclatural_code.upcase) : content_tag(:em, 'ERROR') -%>)
</p>

<p>
Expand Down
12 changes: 12 additions & 0 deletions app/views/taxon_names/_parent_navigator.erb
@@ -0,0 +1,12 @@
<div>
<h3>Navigate to</h3>
<% taxon_name.ancestors.each do |p| -%>
<%= taxon_name_link(p.metamorphosize) -%><br>
<% end %>

<div><br><%= taxon_name_tag(taxon_name) -%></div> <br>

<% taxon_name.children.each do |p| -%>
<%= taxon_name_link(p.metamorphosize) -%><br>
<% end %>
</div>
6 changes: 5 additions & 1 deletion app/views/taxon_names/show.html.erb
@@ -1,8 +1,12 @@
<% content_for :editing do %>
<% content_for :tasks do %>
<%= render(partial: 'tasks') -%>
<% end %>
<% content_for :show_navigation do %>
<%= render( 'parent_navigator', taxon_name: @taxon_name) -%>
<% end %>
<%= render(partial: 'shared/data/show', locals: {object: @taxon_name}) -%>

0 comments on commit 75530c1

Please sign in to comment.