* fix for VRFS-1362 by not putting all query params back in URL

This commit is contained in:
Seth Call 2014-03-06 16:17:32 -06:00
parent a87f07c654
commit a570856156
4 changed files with 9 additions and 5 deletions

View File

@ -222,7 +222,7 @@ ActiveAdmin.register_page "Bootstrap" do
elsif IcecastMountTemplate.count == 0
semantic_form_for IcecastMountTemplate.new, :url => admin_bootstrap_create_mount_template_path, :builder => ActiveAdmin::FormBuilder do |f|
f.inputs "New Mount Template" do
f.input :hostname, :label => "jam-web public hostname:port (such that icecast can reach it)"
f.input :hostname, :label => "UNUSED?? jam-web public hostname:port (such that icecast can reach it)"
f.input :default_mime_type, :as => :select, :collection => ["ogg", "mp3"]
end
f.actions

View File

@ -169,7 +169,7 @@ class UsersController < ApplicationController
load_location(request.remote_ip, location)
gon.signup_errors = true
gon.musician_instruments = instruments
render 'new', :layout => 'web'
render "new", :layout => 'web'
else
sign_in @user
@ -443,6 +443,10 @@ class UsersController < ApplicationController
query = {}
query[:invitation_code] = invited_user.invitation_code if invited_user
query[:facebook_signup] = fb_signup.lookup_id if fb_signup
signup_path + "?" + params.to_query
if query.length > 0
signup_path + "?" + query.to_query
else
signup_path
end
end
end

View File

@ -3,7 +3,7 @@
<div class="content-wrapper register-page">
<h2>Create a JamKazam account</h2>
<%= form_for(@user, :url => @signup_postback) do |f| %>
<%= form_for(@user, :url => @signup_postback, :method => :post) do |f| %>
<!-- register left column -->
<div class="register-left left w45">

View File

@ -301,7 +301,7 @@ describe "Music Session API ", :type => :api do
client = FactoryGirl.create(:connection, :user => user, :ip_address => "1.1.1.1")
post '/api/sessions.json', defopts.merge({:client_id => client.client_id, :tracks => nil}).to_json, "CONTENT_TYPE" => 'application/json'
last_response.status.should eql(422)
JSON.parse(last_response.body)["errors"]["genres"][0].should == ValidationMessages::SELECT_AT_LEAST_ONE
JSON.parse(last_response.body)["errors"]["tracks"][0].should == ValidationMessages::SELECT_AT_LEAST_ONE
# check that the transaction was rolled back
MusicSession.all().length.should == original_count