diff app/views/users/_form.rhtml @ 107:361f1e8b2e23 luisf

Feature #1:
Fixed the collection_select variable issue
User edit view: removed wiki toolbar and description from the description text area in the user;
User edit view: added institutions collection select;
User show view: institution name now visible.
Users_controller: fixed a bug retrieving the institution name

--- a/app/views/users/_form.rhtml	Fri Dec 17 10:28:24 2010 +0000
+++ b/app/views/users/_form.rhtml	Fri Dec 17 11:18:51 2010 +0000
@@ -23,10 +23,11 @@
 	<h3><%=l(:label_ssamr_details)%></h3>
           <% 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, :class => 'wiki-edit'  %>
-              <%= wikitoolbar_for 'ssamr_user_details_description' %>
-              <br />
-              <em> <%=l(:text_user_ssamr_description_info)%></em>
+              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>                            
+            </p>
+            <p>
+              <label for="ssamr_user_institution"><%=l(:label_ssamr_institution)%></label>
+              <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @user.ssamr_user_detail.institution_id.to_i} ) %>                         
             </p>
           <% end %>          
 </div>