fixed enumeration editing bugs

Author: matthew

Diff for: CHANGELOG

@@ -2,6 +2,7 @@
          - public API change: streamlined_model now called streamlined_ui
          - added CSS IDs to each item table row on the list view (MJB)
          - now outputting flash notices on the list view (MJB)
+         - fixed enumeration editing bugs (MJB)
 
 1.0RC02 -- 02/22/08
          - fixed show stopper bug on editing relationships (SDH)

Diff for: lib/streamlined/column/active_record.rb

@@ -34,11 +34,15 @@ def edit_view
     Streamlined::View::EditViews.create_relationship(:enumerable_select)
   end
 
+  def show_view
+    Streamlined::View::ShowViews.create_summary(:enumeration)
+  end
+  
   def render_td_show(view, item)
     if enumeration
       content = item.send(self.name)
       if enumeration.first.is_a?(Array)
-        key_value_pair = enumeration.detect { |e| e.last == content }
+        key_value_pair = enumeration_key_for(content)
         content = key_value_pair.first if key_value_pair
       end
       content = content && !content.blank? ? content : self.unassigned_value
@@ -53,12 +57,16 @@ def enumeration
     @enumeration.is_a?(Hash) ? @enumeration.to_a : @enumeration
   end
 
+  def enumeration_key_for(value)
+    enumeration.detect { |e| e.last == value } 
+  end
+  
   def render_td_list(view, item)
     id = relationship_div_id(name, item)
     div = render_td_show(view, item)
     div = div_wrapper(id) { div } if enumeration
     div += view.link_to_function("Edit", "Streamlined.Enumerations." <<
-      "open_enumeration('#{id}', this, '/#{view.controller_name}')") if enumeration && editable
+      "open_enumeration('#{id}', this, '/#{view.controller_path}')") if enumeration && editable
     div
   end
 

Diff for: lib/streamlined/view/show_views.rb

@@ -37,6 +37,11 @@ class Name < Streamlined::View::Base
 
   end
 
+  # Renders the enumeration value.
+  class Enumeration < Streamlined::View::Base
+    
+  end
+  
   class Graph < Streamlined::View::Base
     def must_have_sparklines!
       raise "STREAMLINED ERROR: Cannot use the Sparklines Graph relationship summary: need to install Sparklines plugin first (requires RMagick, which is not the easiest thing to install, we're just warning you)" unless 'Sparklines'.to_const

Diff for: templates/relationships/show_views/_enumeration.rhtml

@@ -0,0 +1,3 @@
+<% value = item.send(relationship.name).to_i -%>
+<% key_value_pair = relationship.enumeration_key_for(value) -%>
+<%= key_value_pair ? key_value_pair.first : relationship.unassigned_value %>

Diff for: test/unit/streamlined/column/active_record_test.rb

@@ -256,7 +256,7 @@ def ar_column(name, human_name)
   end
 
   def setup_mocks(item_attrs={})
-    @view = flexmock(:controller_name => 'controller_name', :link_to_function => 'link')
+    @view = flexmock(:controller_path => 'controller_path', :link_to_function => 'link')
     @item = flexmock(item_attrs.reverse_merge(:id => 123, :column => 'render'))
   end
 end