alternate_values now display type, attribute, and value

SpeciesFileGroup · Nov 20, 2014 · 927b7ea · 927b7ea
1 parent 461e36e
commit 927b7ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/helpers/alternate_values_helper.rb b/app/helpers/alternate_values_helper.rb
@@ -1,5 +1,10 @@
 module AlternateValuesHelper
 
+  def alternate_value_tag(alternate_value)
+    return nil if alternate_value.nil?
+    ["#{alternate_value.value},", alternate_value.class.name.demodulize.downcase, "of \"#{alternate_value.original_value}\"", "(on '#{alternate_value.alternate_value_object_attribute}')"].join(' ')
+  end
+
   def link_to_destroy_alternate_value(link_text, alternate_value)
     link_to(link_text, '', class: 'alternate-value-destroy', alternate_value_id: alternate_value.id)
   end
@@ -9,14 +14,14 @@ def link_to_edit_alternate_value(link_text, alternate_value)
   end
 
   def link_to_add_alternate_value(link_text, f)
-    new_object = f.object.class.reflect_on_association(:alternate_values).klass.new({alternate_value_object_type:      f.object.class.base_class.name,
-                                                                                     alternate_value_object_id:        f.object.id,
+    new_object = f.object.class.reflect_on_association(:alternate_values).klass.new({alternate_value_object_type: f.object.class.base_class.name,
+                                                                                     alternate_value_object_id: f.object.id,
                                                                                      alternate_value_object_attribute: 'name'})
     # new_object = AlternateValue.new(alternate_value_object_id:   f.object.id,
     #                                 alternate_value_object_type: f.object.class.base_class.name)
     # fields     = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
     #   render(association.to_s.singularize + "_fields", :f => builder)
-    fields     = f.fields_for(:alternate_values, new_object, :child_index => 'new_alternate_values') do |builder|
+    fields = f.fields_for(:alternate_values, new_object, :child_index => 'new_alternate_values') do |builder|
       render('alternate_values/alternate_value_fields', :avf => builder)
     end
     # link_to(link_text, '', id: "#{association[0]}-add", onclick: "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")
@@ -26,8 +31,8 @@ def link_to_add_alternate_value(link_text, f)
   end
 
   def add_alternate_value_link(object: object, attribute: nil, user: user)
-    link_to('Add alternate value', new_alternate_value_path(alternate_value: {alternate_value_object_type:      object.class.base_class.name,
-                                                                              alternate_value_object_id:        object.id,
+    link_to('Add alternate value', new_alternate_value_path(alternate_value: {alternate_value_object_type: object.class.base_class.name,
+                                                                              alternate_value_object_id: object.id,
                                                                               alternate_value_object_attribute: attribute}))
   end
 

diff --git a/app/views/alternate_values/_object_pane.html.erb b/app/views/alternate_values/_object_pane.html.erb
@@ -2,7 +2,7 @@
   <h3> Alternate values </h3>
   <ul>
     <% object.alternate_values.each do |alternate_value| -%>
-      <li> <%= alternate_value.value -%> </li>
+      <li> <%= alternate_value_tag(alternate_value) -%> </li>
     <% end %>
   </ul>