changeset 158:e71a969c151a feature_55

migration with new "institution_type" column in ssamr_user_details table.

radio buttons now rely on database

--- a/app/controllers/users_controller.rb	Wed Jan 26 15:58:02 2011 +0000
+++ b/app/controllers/users_controller.rb	Thu Jan 27 18:46:29 2011 +0000
@@ -140,10 +140,7 @@
     @ssamr_user_details = @user.ssamr_user_detail
 
     @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i
-
-    if @institution_type == "other"
-      @selected_institution_id = 11
-    end
+    @institution_type = @ssamr_user_details.institution_type
     
     @auth_sources = AuthSource.find(:all)
     @membership ||= Member.new
@@ -180,9 +177,14 @@
     if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty?
       @ssamr_user_details.description = @user.ssamr_user_detail.description
       @ssamr_user_details.institution_id = @user.ssamr_user_detail.institution_id
+      @ssamr_user_details.other_institution = @user.ssamr_user_detail.other_institution
+      @ssamr_user_details.institution_type = @user.ssamr_user_detail.institution_type
+
     else
       @ssamr_user_details.description = params[:ssamr_user_details][:description]
       @ssamr_user_details.institution_id = params[:ssamr_user_details][:institution_id]
+      @ssamr_user_details.other_institution = params[:ssamr_user_details][:other_institution]
+      @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type]
       @ssamr_user_details.save!
     end
 

--- a/app/views/users/_form.rhtml	Wed Jan 26 15:58:02 2011 +0000
+++ b/app/views/users/_form.rhtml	Thu Jan 27 18:46:29 2011 +0000
@@ -26,17 +26,14 @@
               <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>                            
             </p>
 
-
              <p>
-                <%= radio_button_tag(:institution_type, "list", true) %>
-                <label for="ssamr_user_institution"><%=l(:label_ssamr_institution)%></label>
-                <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @selected_institution_id} ) %>
+               <%= ssamr_user_detail.radio_button :institution_type, true, :checked => true %>
+               <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @selected_institution_id} ) %>
              </p>
 
              <p>
-                <%= radio_button_tag(:institution_type, "other", false) %>
-                <%= label_tag("Other institution: ") %>
-                <%= ssamr_user_detail.text_field(:institution_id) %>
+                <%= ssamr_user_detail.radio_button :institution_type, false, :checked => false %> Other:
+                <%= ssamr_user_detail.text_field(:other_institution) %>
              </p>
 
           <% end %>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/migrate/20110127161758_add_institution_type_column_to_ssamr_user_details.rb	Thu Jan 27 18:46:29 2011 +0000
@@ -0,0 +1,9 @@
+class AddInstitutionTypeColumnToSsamrUserDetails < ActiveRecord::Migration
+  def self.up
+     add_column :ssamr_user_details, :institution_type, :boolean
+  end
+
+  def self.down
+    remove_column :ssamr_user_details, :institution_type
+  end
+end