# HG changeset patch
# User luisf
# Date 1292584731 0
# Node ID 361f1e8b2e23b3cbaadebce45ab399df8b76a1ee
# Parent  f6ea6ffaaeebfaa83e11a08e8de836281afdf103
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

diff -r f6ea6ffaaeeb -r 361f1e8b2e23 app/controllers/users_controller.rb
--- a/app/controllers/users_controller.rb	Fri Dec 17 10:28:24 2010 +0000
+++ b/app/controllers/users_controller.rb	Fri Dec 17 11:18:51 2010 +0000
@@ -55,7 +55,7 @@
     if @user.ssamr_user_detail != nil
       @description = @user.ssamr_user_detail.description
       if @user.ssamr_user_detail.institution_id != nil
-        @institution = @institution.find(@user.ssamr_user_detail.institution_id)
+        @institution_name = Institution.find(@user.ssamr_user_detail.institution_id).name
       end
     end
     
diff -r f6ea6ffaaeeb -r 361f1e8b2e23 app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Fri Dec 17 10:28:24 2010 +0000
+++ b/app/views/account/register.rhtml	Fri Dec 17 11:18:51 2010 +0000
@@ -42,7 +42,7 @@
 
                         <p>
                           <label for="ssamr_user_institution"><%=l(:label_ssamr_institution)%></label>
-                            <%= ssamr_user_detail.collection_select(:university, Institution.all, :id, :name, {:prompt => true}) %>
+                            <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:prompt => true}) %>
                         </p>
                 <% end %>
           
diff -r f6ea6ffaaeeb -r 361f1e8b2e23 app/views/users/_form.rhtml
--- 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>
diff -r f6ea6ffaaeeb -r 361f1e8b2e23 app/views/users/show.rhtml
--- a/app/views/users/show.rhtml	Fri Dec 17 10:28:24 2010 +0000
+++ b/app/views/users/show.rhtml	Fri Dec 17 11:18:51 2010 +0000
@@ -23,6 +23,9 @@
 <h3><%=l(:label_ssamr_description)%></h3>
 <%= textilizable @description %>
 
+<h3><%=l(:label_ssamr_institution)%></h3>
+<%= h @institution_name %>
+
 
 <% unless @memberships.empty? %>
 <h3><%=l(:label_project_plural)%></h3>