<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -60,15 +60,11 @@ module ActiveScaffold
       def active_scaffold_input_singular_association(column, options)
         associated = @record.send(column.association.name)
 
-        options_for_select = options_for_association(column.association)
-        select_options = [[as_('- select -'),nil]]
-        select_options += [[ associated.to_label, associated.id ]] unless associated.nil? or options_for_select.find {|label, id| id == associated.id}
-        select_options += options_for_select
-
-        selected = associated.nil? ? nil : associated.id
+        select_options = options_for_association(column.association)
+        select_options.unshift([ associated.to_label, associated.id ]) unless associated.nil? or select_options.find {|label, id| id == associated.id}
 
         options[:name] += '[id]'
-        select(:record, column.name, select_options.uniq, { :selected =&gt; selected }, options)
+        select(:record, &quot;#{column.name}_id&quot;, select_options.uniq, {:include_blank =&gt; as_('- select -')}, options)
       end
 
       def active_scaffold_input_plural_association(column, options)</diff>
      <filename>lib/helpers/form_column_helpers.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d3e67ce8044ac64febb3127294c700d8e05ea941</id>
    </parent>
  </parents>
  <author>
    <name>Sergio Cambra</name>
    <email>sergio@entrecables.com</email>
  </author>
  <url>http://github.com/gaffo/active_scaffold/commit/0ef10210eee7918fdb2f941dfaee02caf97284e9</url>
  <id>0ef10210eee7918fdb2f941dfaee02caf97284e9</id>
  <committed-date>2008-10-30T16:55:51-07:00</committed-date>
  <authored-date>2008-10-30T16:53:21-07:00</authored-date>
  <message>Fix #404 http://code.google.com/p/activescaffold/issues/detail?id=404
Change active_scaffold_input_singular_association in order to rails marks the field with error. Some cleanup of that method.</message>
  <tree>bfcce389bb5f69eeda4b411bca41fcd35bb3f005</tree>
  <committer>
    <name>Sergio Cambra</name>
    <email>sergio@entrecables.com</email>
  </committer>
</commit>
