Profile pictures in user list

app/controllers/management/users_controller.rb

@@ -1,7 +1,7 @@
 module Management
   class UsersController < ManagementController
     def index
-      @users = User.all
+      @users = User.includes(:speaker_profile)
     end
 
     def toggle_admin

app/models/user.rb

@@ -20,4 +20,12 @@ class User < ActiveRecord::Base
   def toggle_admin!
     update admin: !admin
   end
+
+  def profile_picture
+    if speaker_profile.present?
+      speaker_profile.picture
+    else
+      PictureUploader.new
+    end
+  end
 end

app/uploaders/picture_uploader.rb

@@ -15,12 +15,9 @@ class PictureUploader < CarrierWave::Uploader::Base
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
+  def default_url
-  #   # For Rails 3.1+ asset pipeline compatibility:
+    ActionController::Base.helpers.asset_path("fallback/profile_picture/" + [version_name, "default.png"].compact.join('_'))
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  end
-  #
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
 
   # Process files as they are uploaded:
   # process :scale => [200, 300]

app/views/management/users/index.html.slim

@@ -7,12 +7,14 @@
         table.table.table-striped.table-hover.record-table#conferences
           thead
             tr
+              th = User.human_attribute_name :picture
               th = User.human_attribute_name :title
               th = User.human_attribute_name :admin
               th.actions
           tbody
             - @users.each do |user|
               tr
+                td= image_tag(user.profile_picture.thumb.url)
                 td= user.name
                 td.boolean-col
                   - if user.admin?