cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove pd checkbox from signup page

Browse source
This commit is contained in:
Anton Khorev 2025-01-18 07:11:41 +03:00
parent 7c551c5f73
commit 9254f0c2be
4 changed files with 18 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/users_controller.rb
View file

@ -222,8 +222,7 @@ class UsersController < ApplicationController
def user_params
params.require(:user).permit(:email, :display_name,
:auth_provider, :auth_uid,
:pass_crypt, :pass_crypt_confirmation,
:consider_pd)
:pass_crypt, :pass_crypt_confirmation)
end
##

10
app/views/users/new.html.erb
View file

@ -78,17 +78,9 @@
:contributor_terms_link => link_to(t(".by_signing_up.contributor_terms"),
t(".by_signing_up.contributor_terms_url"),
:target => :new)) %></p>
<%= f.form_group do %>
<%= f.check_box :consider_pd,
:tabindex => 5,
:label => t(".consider_pd_html",
:consider_pd_link => link_to(t(".consider_pd"),
t(".consider_pd_url"),
:target => :new)) %>
<% end %>
<div class="mb-3">
<%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 6) %>
<%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :class => "btn btn-primary", :tabindex => 5) %>
</div>
<% end %>

3
config/locales/en.yml
View file

@ -2787,9 +2787,6 @@ en:
privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy
privacy_policy_title: OSMF privacy policy including section on email addresses
html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
consider_pd: "public domain"
consider_pd_url: https://osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
or: "or"
use external auth: "or sign up with a third party"
no_such_user:

48
test/integration/user_creation_test.rb
View file

@ -34,8 +34,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => dup_email,
:display_name => display_name,
:pass_crypt => "testtest",
:pass_crypt_confirmation => "testtest",
:consider_pd => "1" } }
:pass_crypt_confirmation => "testtest" } }
end
end
end
@ -57,8 +56,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:pass_crypt => "testtest",
:pass_crypt_confirmation => "testtest",
:auth_provider => "google",
:auth_uid => "123454321",
:consider_pd => "1" } }
:auth_uid => "123454321" } }
end
end
end
@ -97,8 +95,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => email,
:display_name => display_name,
:pass_crypt => "testtest",
:pass_crypt_confirmation => "blahblah",
:consider_pd => "1" } }
:pass_crypt_confirmation => "blahblah" } }
end
end
end
@ -117,8 +114,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => email,
:display_name => dup_display_name,
:auth_provider => "google",
:auth_uid => "123454321",
:consider_pd => "1" } }
:auth_uid => "123454321" } }
end
end
end
@ -138,8 +134,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:pass_crypt => "testtest",
:pass_crypt_confirmation => "testtest",
:consider_pd => "1" } }
:pass_crypt_confirmation => "testtest" } }
assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
follow_redirect!
end
@ -192,8 +187,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:pass_crypt => password,
:pass_crypt_confirmation => password,
:consider_pd => "1" },
:pass_crypt_confirmation => password },
:referer => referer }
assert_response(:redirect)
assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
@ -254,8 +248,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:auth_provider => "openid",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
end
end
end
@ -330,8 +323,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:auth_provider => "openid",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
follow_redirect!
end
end
@ -392,8 +384,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:auth_provider => "google",
:auth_uid => auth_uid,
:consider_pd => "1" },
:auth_uid => auth_uid },
:email_hmac => email_hmac }
assert_redirected_to welcome_path
follow_redirect!
@ -479,8 +470,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:email_hmac => email_hmac,
:display_name => display_name,
:auth_provider => "google",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
assert_response :redirect
follow_redirect!
end
@ -541,8 +531,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:auth_provider => "facebook",
:auth_uid => auth_uid,
:consider_pd => "1" },
:auth_uid => auth_uid },
:email_hmac => email_hmac }
assert_redirected_to welcome_path
follow_redirect!
@ -628,8 +617,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:email_hmac => email_hmac,
:display_name => display_name,
:auth_provider => "facebook",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
assert_response :redirect
follow_redirect!
end
@ -689,8 +677,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:params => { :user => { :email => new_email,
:display_name => display_name,
:auth_provider => "microsoft",
:auth_uid => auth_uid,
:consider_pd => "1" },
:auth_uid => auth_uid },
:email_hmac => email_hmac }
assert_redirected_to welcome_path
follow_redirect!
@ -775,8 +762,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:email_hmac => email_hmac,
:display_name => display_name,
:auth_provider => "microsoft",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
assert_response :redirect
follow_redirect!
end
@ -926,8 +912,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:email_hmac => email_hmac,
:display_name => display_name,
:auth_provider => "github",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
assert_response :redirect
follow_redirect!
end
@ -1076,8 +1061,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
:email_hmac => email_hmac,
:display_name => display_name,
:auth_provider => "wikipedia",
:auth_uid => auth_uid,
:consider_pd => "1" } }
:auth_uid => auth_uid } }
assert_response :redirect
follow_redirect!
end