Skip to content
Snippets Groups Projects
Commit 82fdc02d authored by pabois's avatar pabois
Browse files

user picture

parent 09ba257e
No related branches found
No related tags found
No related merge requests found
......@@ -57,6 +57,6 @@ class Admin::UsersController < Admin::ApplicationController
end
def user_params
params.require(:user).permit(:first_name, :last_name, :role, :language_id)
params.require(:user).permit(:first_name, :last_name, :role, :language_id, :picture, :picture_delete)
end
end
......@@ -45,12 +45,15 @@
class User < ApplicationRecord
include WithDevise
# has_one_attached_resizable :picture
has_one_attached :picture
belongs_to :university
belongs_to :language
has_one :researcher, class_name: 'Research::Researcher'
def to_s
first_name || last_name ? "#{first_name} #{last_name}"
(first_name.present? || last_name.present?) ? "#{first_name} #{last_name}"
: "#{email}"
end
end
......@@ -7,9 +7,10 @@
</div>
<div class="col-md-4">
<%= f.input :first_name %>
<%= f.input :last_name %>
</div>
<div class="col-md-4">
<%= f.input :last_name %>
<%= f.input :picture %>
</div>
</div>
<% content_for :buttons do %>
......
......@@ -27,6 +27,13 @@
</p>
<% end %>
<% if @user.picture.attached? && @user.picture.variable? %>
<p>
<strong>Picture:</strong>
<%= image_tag @user.picture.variant(resize: '200x') %>
</p>
<% end %>
<% content_for :buttons do %>
<%= edit_link @user %>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment