Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
2947edc7f4 |
|
|
@ -20,7 +20,7 @@ class UsersController < ApplicationController
|
||||||
# PATCH/PUT /user/1 or /user/1.json
|
# PATCH/PUT /user/1 or /user/1.json
|
||||||
def update
|
def update
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
logger.debug(account_params)
|
logger.debug(user_params)
|
||||||
if @user.update()
|
if @user.update()
|
||||||
format.html { redirect_to account_url(@user), notice: "User was successfully updated." }
|
format.html { redirect_to account_url(@user), notice: "User was successfully updated." }
|
||||||
format.json { render :show, status: :ok, location: @user }
|
format.json { render :show, status: :ok, location: @user }
|
||||||
|
|
@ -44,12 +44,12 @@ class UsersController < ApplicationController
|
||||||
private
|
private
|
||||||
# Use callbacks to share common setup or constraints between actions.
|
# Use callbacks to share common setup or constraints between actions.
|
||||||
def set_user
|
def set_user
|
||||||
@user = Account.find(params[:id])
|
@user = User.find(params[:id])
|
||||||
end
|
end
|
||||||
|
|
||||||
# Only allow a list of trusted parameters through.
|
# Only allow a list of trusted parameters through.
|
||||||
def user_params
|
def user_params
|
||||||
params.require(:user).permit(:name, :group)
|
params.require(:user).permit(:first_name,:last_name, :group)
|
||||||
end
|
end
|
||||||
def check_group
|
def check_group
|
||||||
if current_user.group != "admin"
|
if current_user.group != "admin"
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ class User
|
||||||
# field :unlock_token, type: String # Only if unlock strategy is :email or :both
|
# field :unlock_token, type: String # Only if unlock strategy is :email or :both
|
||||||
# field :locked_at, type: Time
|
# field :locked_at, type: Time
|
||||||
field :group, type: String, default: ""
|
field :group, type: String, default: ""
|
||||||
field :name, type: String, default: ""
|
field :first_name, type: String, default: ""
|
||||||
|
field :last_name, type: String, default: ""
|
||||||
include Mongoid::Timestamps
|
include Mongoid::Timestamps
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,17 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<%= f.label :first_name %><br />
|
||||||
|
<%= f.text_field :first_name, autocomplete: "new-first-name", class: "input is-small" , placeholder: "New First name" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<%= f.label :last_name %><br />
|
||||||
|
<%= f.text_field :last_name, autocomplete: "new-last-name", class: "input is-small" , placeholder: "New Last name" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<%= f.label :password_confirmation %><br />
|
<%= f.label :password_confirmation %><br />
|
||||||
<%= f.password_field :password_confirmation, autocomplete: "new-password", class: "input is-small" , placeholder: "New password confirmation" %>
|
<%= f.password_field :password_confirmation, autocomplete: "new-password", class: "input is-small" , placeholder: "New password confirmation" %>
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,17 @@
|
||||||
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: "input is-small" , placeholder: :email %>
|
<%= f.email_field :email, autofocus: true, autocomplete: "email", class: "input is-small" , placeholder: :email %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<%= f.label :first_name %><br />
|
||||||
|
<%= f.text_field :first_name, autocomplete: "new-first-name", class: "input is-small" , placeholder: "New First name" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<%= f.label :last_name %><br />
|
||||||
|
<%= f.text_field :last_name, autocomplete: "new-last-name", class: "input is-small" , placeholder: "New Last name" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<%= f.label :password %>
|
<%= f.label :password %>
|
||||||
<% if @minimum_password_length %>
|
<% if @minimum_password_length %>
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
</div>
|
</div>
|
||||||
<% if user_signed_in? %>
|
<% if user_signed_in? %>
|
||||||
<div class="navbar-item">
|
<div class="navbar-item">
|
||||||
<span class="tag is-info is-medium">Connected as <%= current_user.name %></span>
|
<span class="tag is-info is-medium">Connected as <%= current_user.first_name %></span>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div class="navbar-end">
|
<div class="navbar-end">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue