Merge branch 'master' of github.com:noesya/osuny

app/controllers/admin/users_controller.rb

@@ -57,6 +57,6 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:first_name, :last_name, :role, :language_id, :mobile_phone)
+    params.require(:user).permit(:first_name, :last_name, :role, :language_id, :picture, :picture_delete, :mobile_phone)
   end
 end

app/models/user.rb

@@ -60,9 +60,10 @@ class User < ApplicationRecord
   belongs_to :university
   belongs_to :language
   has_one :researcher, class_name: 'Research::Researcher'
+  has_one_attached :picture
 
   def to_s
-    first_name || last_name ? "#{first_name} #{last_name}"
+    (first_name.present? || last_name.present?) ? "#{first_name} #{last_name}"
                             : "#{email}"
   end
 end

app/views/admin/users/_form.html.erb

@@ -6,9 +6,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 class="col-md-4">
       <%= f.association :language, include_blank: false %>

app/views/admin/users/show.html.erb

@@ -31,6 +31,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 %>