Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 23:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a field for user email address

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-07-20 18:41:10 +03:00
parent 0ff46f63dc
commit dbaa9a85cb
7 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/preferences_controller.rb
View file

@ -44,7 +44,7 @@ private
end
def user_params
params.require(:user).permit(:login, :first_name, :last_name, :password_confirmation, :password, :auth_type, :open_id_url)
params.require(:user).permit(:login, :first_name, :last_name, :email, :password_confirmation, :password, :auth_type, :open_id_url)
end
# Display notification if preferences are successful updated

2
app/controllers/users_controller.rb
View file

@ -187,7 +187,7 @@ class UsersController < ApplicationController
private
def user_params
params.require(:user).permit(:login, :first_name, :last_name, :password_confirmation, :password, :auth_type, :open_id_url)
params.require(:user).permit(:login, :first_name, :last_name, :email, :password_confirmation, :password, :auth_type, :open_id_url)
end
def get_new_user

1
app/models/user.rb
View file

@ -107,6 +107,7 @@ class User < ApplicationRecord
validates_length_of :login, within: 3..80
validates_uniqueness_of :login, on: :create
validate :validate_auth_type
validates :email, format: { with: URI::MailTo::EMAIL_REGEXP }
before_create :crypt_password, :generate_token
before_update :crypt_password

3
app/views/preferences/_profile.html.erb
View file

@ -4,6 +4,9 @@
<div class="form-group">
<%= pref_with_text_field 'user', 'last_name' %>
</div>
<div class="form-group">
<%= pref_with_text_field 'user', 'email' %>
</div>
<div class="form-group">
<%= pref_with_select_field('prefs', 'locale', I18n.available_locales.map {|l| l.to_s}) %>
</div>

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

@ -22,6 +22,10 @@
<%= label_tag "user_login", t('users.desired_login') %>
<%= text_field "user", "login", class: "form-control" %>
</div>
<div class="label-element-combo">
<%= label_tag "user_email", t('users.email_address') %>
<%= text_field "user", "email", class: "form-control" %>
</div>
<div class="label-element-combo">
<%= label_tag "user_password", t('users.choose_password') %>
<%= password_field "user", "password", class: "form-control" %>