From aa43ab12dd7a93795039de4ba9f31b866827a2d1 Mon Sep 17 00:00:00 2001
From: Andrew Radev <andrey.radev@gmail.com>
Date: Mon, 25 May 2015 11:41:11 +0300
Subject: [PATCH] Profile pictures in user list

---
 .../fallback/profile_picture/medium_default.png  | Bin 0 -> 3003 bytes
 .../profile_picture/schedule_default.png         | Bin 0 -> 1814 bytes
 .../fallback/profile_picture/thumb_default.png   | Bin 0 -> 987 bytes
 app/controllers/management/users_controller.rb   |   2 +-
 app/models/user.rb                               |   8 ++++++++
 app/uploaders/picture_uploader.rb                |   9 +++------
 app/views/management/users/index.html.slim       |   2 ++
 7 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 app/assets/images/fallback/profile_picture/medium_default.png
 create mode 100644 app/assets/images/fallback/profile_picture/schedule_default.png
 create mode 100644 app/assets/images/fallback/profile_picture/thumb_default.png

diff --git a/app/assets/images/fallback/profile_picture/medium_default.png b/app/assets/images/fallback/profile_picture/medium_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..619f4fe2f46c1d83fc06ee36ae936a767458ffe3
GIT binary patch
literal 3003
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/fallback/profile_picture/schedule_default.png b/app/assets/images/fallback/profile_picture/schedule_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f98cf5e7c72d9ce52338a8d09df1c3d585b3eb1
GIT binary patch
literal 1814
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/fallback/profile_picture/thumb_default.png b/app/assets/images/fallback/profile_picture/thumb_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5f3820807c37d29a0c2efa60b87811fd796151e
GIT binary patch
literal 987
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1SBWM%0B~AEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e4<x9|RZdT|OBo
z!d~L(>&kwgRgzoLASW(zA_D`{eNPw1kch)?XWlNFZ6MGVIroAhN0QH{fA6o_I7($b
zym4dB74CAIc`nC<W^6G&TmMwj`^Du=tM7__`1Dxy*Y}oxW(Ul#fna?D(0K*Fa@WrN
zX=0S^&vCTy3~Txn#U6#Gx)-;X*~;*>A5N5LTYrp+Vd<1>R?j}(^r&B=l%0FoBsBEx
zz4FTsmL&)}$%Xgx^YhC$>MeL|q1WZ)6}fL}?rpt3R}Rg2T#7B{6PAh`eDd|{*34N8
zLJ!5rDNb2m?7wVslHBvxGRb=s!WIcH4Y@EyqpL+AbCzDKtH#BscB8r94<~Kom^Nin
zkQFa?vP?=^ybi+zC%<GXPmab3?~Cp|7Fd+CXr<qxDZi}u>5Cn^QNP}g@xb4WdcpTn
zbQnJPOy3uA*x-!Mfor!CC2YQnHC+AvS7yxu^&d%JYwK;~o+p_47T4=!zpdLp|Fc~4
zGWH!cvDYW_UNbpcxBa`kyufE?`x(761MDNSdktf+>o$qHUd-EWe5@rYclF!f-)u9y
zK5*{*xz$km@q5+VS<%x{R|K<7Z@hMElg{mJXE*g+*!VK`x@59eurJ4y&Yw$iZ*SWj
z$W@+uUFLAtrI*))oL+?dp28gS;rWl9>t3G<DUH={Z8h}U9Fi>?FkfNG6d|XO&{VTy
z|1G{AT{Pv{>zGrTs^U%>r;U!?xP9LIyxxiI`#l>Ut(<YJWZINX6<QLXwdUq02YOvU
zI;+^O{iVvepSvP{hukyYAmFsRrc`{H@lCDxyI;;p*DsH>TF5LtJxJ?p-k0>`h&i86
z%HG(q<=W%?2U=nbOCqIi@m9Yoxz-c1DttqZ%90t9RgWhHacM5n&OF)6$}vf0=FQ+9
zZiY!Jj8EbY^&XYjo%|(M`1zk(hR==(1?fBqoqkAy`{lkrg$axe4;aH;i&b_M?CN6f
z7BJep{=0bU6an|Re;ui7d3Wi|(Cjf>`lWd8iw$B+OD;<65n-?hR{3RfF7xVB7mlAf
ztnFI`{$28yKKHbaxn}Y!H}RedVBTO*Epd$~Nl7e8wMs5Z1yT$~28O1(2Bx}3rXhxg
zR>me)#+KR!##ROf6}r`+oQTkno1c=IR*9~`*viBLqQPD6RuoVJgQu&X%Q~loCIGtg
Bs!0F<

literal 0
HcmV?d00001

diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index b70a7cf..5bffbbe 100644
--- a/app/controllers/management/users_controller.rb
+++ b/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
diff --git a/app/models/user.rb b/app/models/user.rb
index e7cbc1f..3412dda 100644
--- a/app/models/user.rb
+++ b/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
diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb
index 0f60f9b..3dc3914 100644
--- a/app/uploaders/picture_uploader.rb
+++ b/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
-  #   # For Rails 3.1+ asset pipeline compatibility:
-  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
-  #
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
+  def default_url
+    ActionController::Base.helpers.asset_path("fallback/profile_picture/" + [version_name, "default.png"].compact.join('_'))
+  end
 
   # Process files as they are uploaded:
   # process :scale => [200, 300]
diff --git a/app/views/management/users/index.html.slim b/app/views/management/users/index.html.slim
index d608b95..d807e5f 100644
--- a/app/views/management/users/index.html.slim
+++ b/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?