# HG changeset patch
# User Chris Cannam
# Date 1372841851 -3600
# Node ID 0f5c32bfd33e91367aac53787a7ad7db7994e03b
# Parent  f1fb4091d7f3fe01601161709407e75fd9bba374# Parent  90d09ace39bf28c1679b8739f5d6d19eb67a3023
Merge from branch "luisf"

diff -r f1fb4091d7f3 -r 0f5c32bfd33e app/views/users/_form.html.erb
--- a/app/views/users/_form.html.erb	Fri Jun 21 15:05:50 2013 +0100
+++ b/app/views/users/_form.html.erb	Wed Jul 03 09:57:31 2013 +0100
@@ -1,5 +1,6 @@
-<%= javascript_include_tag "ssamr_institutions" %>
-
+<% content_for :header_tags do %>
+  <%= javascript_include_tag "ssamr_institutions" %>
+<% end %>
 
 <%= error_messages_for 'user' %>
 
@@ -27,9 +28,9 @@
 
 <div class="box tabular">
 	<h3><%=l(:label_ssamr_details)%></h3>
-          <%= labelled_fields_for :ssamr_user_details do |ssamr_user_detail| %>
+          <%= labelled_fields_for :ssamr_user_detail, @user.ssamr_user_detail do |ssamr_user_detail| %>
             <p>
-              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>                            
+              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>
             </p>
 
             <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>