Find correct user on users#show

ZeusWPI · Feb 4, 2016 · 71fc48c · 71fc48c
1 parent d723c46
commit 71fc48c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -42,6 +42,6 @@ def user_params
     end
 
     def init
-      @user = User.find_by_id(params[:id]) || current_user
+      @user ||= current_user
     end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -25,7 +25,9 @@ def initialize_koelkast
   def initialize_user(user)
     can :read, :all
     can :manage, User, id: user.id
-    can :create, Order, user: user
+    can :create, Order do |order|
+      order.user == user
+    end
     can :destroy, Order do |order|
       order.try(:user) == user && order.deletable
     end