From d723c46c2a28e41b337a416e0bdf1335283e03ce Mon Sep 17 00:00:00 2001 From: benji Date: Thu, 4 Feb 2016 19:03:02 +0100 Subject: [PATCH 1/2] Little design fix --- app/assets/stylesheets/products.css.scss | 4 ++++ app/views/products/_index.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/products.css.scss b/app/assets/stylesheets/products.css.scss index 0feb590..6ee1bfe 100644 --- a/app/assets/stylesheets/products.css.scss +++ b/app/assets/stylesheets/products.css.scss @@ -40,3 +40,7 @@ div.out-of-stock { border-color:red; } + +.expand { + overflow: hidden; +} diff --git a/app/views/products/_index.html.haml b/app/views/products/_index.html.haml index e331386..75965b4 100644 --- a/app/views/products/_index.html.haml +++ b/app/views/products/_index.html.haml @@ -1,4 +1,4 @@ -%div{role: "tabpanel"} +.expand{role: "tabpanel"} / Nav tabs %ul.nav.nav-tabs{role: "tablist"} %li.active{role: "presentation"} From 71fc48cd711b501163980efe1769142104b40676 Mon Sep 17 00:00:00 2001 From: benji Date: Thu, 4 Feb 2016 21:03:03 +0100 Subject: [PATCH 2/2] Find correct user on users#show --- app/controllers/users_controller.rb | 2 +- app/models/ability.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 858ce25..d56ac92 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -42,6 +42,6 @@ class UsersController < ApplicationController 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 index 17d3ced..9f9d7f3 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -25,7 +25,9 @@ class Ability 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