Merged in mocheen/cakeside/stuff (pull request #112)

search and stuff

2 files changed, 23 insertions, 4 deletions

diff --git a/app/controllers/admin/photos_controller.rb b/app/controllers/admin/photos_controller.rb
index 0fedcc79..ac7ead89 100644
--- a/app/controllers/admin/photos_controller.rb
+++ b/app/controllers/admin/photos_controller.rb
@@ -1,8 +1,8 @@
 module Admin
   class PhotosController < AdminController
-    def initialize(photo_repository = Photo, message_bus = Spank::IOC.resolve(:message_bus), storage = Spank::IOC.resolve(:blob_storage))
+    def initialize(photo_repository = Photo, command_bus = Spank::IOC.resolve(:command_bus), storage = Spank::IOC.resolve(:blob_storage))
       @photo_repository = photo_repository
-      @bus = message_bus
+      @bus = command_bus
       @storage = storage
       super()
     end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index d0639d00..d0ddb642 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,11 +1,30 @@
 module Admin
   class UsersController < AdminController
+    def initialize(repository = Spank::IOC.resolve(:users))
+      @repository = repository
+      super()
+    end
+
     def index
-      @users = User.search_by(params[:q])
+      @users = repository.search_with(params)
     end
 
     def show
-      @user = User.includes(creations: :photos).find(params[:id])
+      @user = repository.includes(creations: [:photos, :tags]).find(params[:id])
+    end
+
+    def update
+      @user = User.find(params[:id])
+      @user.update(secure_params)
+      redirect_to :back
     end
+
+    private
+
+    def secure_params
+      params.require(:user).permit(:name, :email, :city, :full_address, :website, :twitter, :facebook)
+    end
+
+    attr_reader :repository
   end
 end