From 3e480981c7279fbe52fff011f7264505c54b9f17 Mon Sep 17 00:00:00 2001 From: Jason Denney Date: Thu, 12 Jun 2014 22:24:00 -0400 Subject: [PATCH] Fix User being able to add bikes --- app/models/ability.rb | 2 +- app/views/site/index.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 23dea4f..2dfc661 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -23,7 +23,7 @@ class Ability def user can :read, :all - can :manage, Bike, :id => @current_user.bike_id unless @current_user.bike.nil? + can :manage, @current_user.bike unless @current_user.bike.nil? can :manage, ::ActsAsLoggable::Log, :loggable_type => "Bike", :loggable_id => @current_user.bike_id can :manage, ::ActsAsLoggable::Log, :loggable_type => "User", :loggable_id => @current_user.id end diff --git a/app/views/site/index.html.haml b/app/views/site/index.html.haml index 239bcc8..04b6e1a 100644 --- a/app/views/site/index.html.haml +++ b/app/views/site/index.html.haml @@ -6,6 +6,7 @@ %a{class: "btn btn-lg btn-block btn-primary", href: new_time_entry_path} Add Time Entry %p %a{class: "btn btn-lg btn-block btn-primary", href: time_entries_path} View Timesheet +- if can? :manage, Bike %p %a{class: "btn btn-lg btn-block btn-primary", href: new_bike_path} Add Bike @@ -13,9 +14,8 @@ %p %a{class: "btn btn-lg btn-block btn-primary", href: bike_path(@bike)} View Your Bike - %p %p - %a{class: "btn btn-lg btn-block btn-primary hidden-xs", href: admin_index_path} Admin View + %a{class: "btn btn-lg btn-block btn-primary hidden-xs", href: admin_index_path} Desktop View %p %input{id: "index_logout", value: "Logout", type: "button", class: "btn btn-lg btn-block btn-danger", "data-url" => destroy_user_session_path }