# HG changeset patch
# User luisf
# Date 1291640096 0
# Node ID 69ee2e406f71ad1813fa69dd4f36aa51c4df50ce
# Parent  9d42bcda8cea2212e9759fd8cebcb4611cc84cd8
Correctly outputs an error message if the user's description field is not set.

diff -r 9d42bcda8cea -r 69ee2e406f71 app/models/user.rb
--- a/app/models/user.rb	Mon Dec 06 11:15:03 2010 +0000
+++ b/app/models/user.rb	Mon Dec 06 12:54:56 2010 +0000
@@ -52,6 +52,7 @@
   belongs_to :auth_source
   
   has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail'
+  accepts_nested_attributes_for :ssamr_user_detail
 
   # Active non-anonymous users scope
   named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"
diff -r 9d42bcda8cea -r 69ee2e406f71 app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Mon Dec 06 11:15:03 2010 +0000
+++ b/app/views/account/register.rhtml	Mon Dec 06 12:54:56 2010 +0000
@@ -2,12 +2,7 @@
 
 <% form_tag({:action => 'register'}, :class => "tabular") do %>
 <%= error_messages_for 'user' %>
-
-<ul>
-  <% for message in @ssamr_user_details.errors.full_messages %>
-  <li><%= message %></li>
-<% end %>
-</ul>
+<%= error_messages_for 'ssamr_user_details' %>
 
 <div class="box">
 <!--[form:user]-->
@@ -37,7 +32,7 @@
 
 
 <h3><%=l(:label_ssamr_details)%></h3>
-	<%= error_messages_for :ssamr_user_details %>
+	
 		<% fields_for :ssamr_user_details, :builder => TabularFormBuilder, :lang => current_language do |ssamr_user_detail| %>	
 			<p><%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true  %></p>
 		<% end %>