From ba57c00dec73d50cf9e847f6e947c361bcf871fd Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 1 Jul 2014 13:19:33 -0500
Subject: [PATCH] * VRFS-1429 - instruments stay selected, and tos stays
 selected

---
 ruby/lib/jam_ruby/models/user.rb             | 1 +
 web/app/assets/stylesheets/web/main.css.scss | 4 ++++
 web/app/controllers/users_controller.rb      | 2 +-
 web/app/views/users/new.html.erb             | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 5e7a8f99f..ebd645815 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -776,6 +776,7 @@ module JamRuby
       signup_confirm_url = options[:signup_confirm_url]
       affiliate_referral_id = options[:affiliate_referral_id]
 
+      puts "terms of service: #{terms_of_service}"
       user = User.new
 
       UserManager.active_record_transaction do |user_manager|
diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss
index d61989e40..d3725237e 100644
--- a/web/app/assets/stylesheets/web/main.css.scss
+++ b/web/app/assets/stylesheets/web/main.css.scss
@@ -394,6 +394,10 @@ body.web {
         width:100%;
       }
     }
+
+    .field.terms_of_service .field_with_errors {
+      display:inline;
+    }
   }
 
   ul {
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 8fa2cc381..81d80255b 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -145,7 +145,7 @@ class UsersController < ApplicationController
 
     birth_date = fixup_birthday(params[:jam_ruby_user]["birth_date(2i)"], params[:jam_ruby_user]["birth_date(3i)"], params[:jam_ruby_user]["birth_date(1i)"])
     location = { :country =>  params[:jam_ruby_user][:country], :state =>  params[:jam_ruby_user][:state], :city =>  params[:jam_ruby_user][:city]}
-    terms_of_service = params[:jam_ruby_user][:terms_of_service].nil? ? false : true
+    terms_of_service = params[:jam_ruby_user][:terms_of_service].nil? || params[:jam_ruby_user][:terms_of_service] == "0"? false : true
     musician = params[:jam_ruby_user][:musician]
 
     @user = UserManager.new.signup(remote_ip: request.remote_ip,
diff --git a/web/app/views/users/new.html.erb b/web/app/views/users/new.html.erb
index e0ec9317b..ffce472cd 100644
--- a/web/app/views/users/new.html.erb
+++ b/web/app/views/users/new.html.erb
@@ -119,7 +119,7 @@
 
         <div class="field terms_of_service">
           <small>
-            <input id="jam_ruby_user_terms_of_service" name="jam_ruby_user[terms_of_service]" type="checkbox"/>
+            <%= f.check_box :terms_of_service %>
             <span>I have read and agree to the JamKazam <%= link_to "terms of service", corp_terms_path, :rel => "external" %>
               .</span>
           </small>