Mercurial > hg > soundsoftware-site

changeset 1348:0f5c32bfd33e live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf"
author Chris Cannam
date Wed, 03 Jul 2013 09:57:31 +0100
parents f1fb4091d7f3 (current diff) 90d09ace39bf (diff)
children 4ff3f8b81ab3 fc0fecf09eb9 a6a25685e5a6 45dbcd39b9e9
files
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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>