more defensive code

camsys · Oct 1, 2018 · ed30fa7 · ed30fa7
1 parent 84a0506
commit ed30fa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/models/abilities/authorized_asset_event_ability.rb b/app/models/abilities/authorized_asset_event_ability.rb
@@ -9,7 +9,7 @@ def initialize(user, organization_ids=[])
       #-------------------------------------------------------------------------
       # Can manage asset events if the asset is owned by their organization
       can :manage, AssetEvent do |ae|
-        ae.asset_event_type.try(:active) && organization_ids.include?(ae.asset.organization_id)
+        ae.asset_event_type.try(:active) && organization_ids.include?(ae.asset.try(:organization_id))
       end
 
       cannot :create, DispositionUpdateEvent do |ae|
@@ -30,7 +30,7 @@ def initialize(user, organization_ids=[])
 
       # Can manage asset events if the asset is owned by their organization
       can :manage, AssetEvent do |ae|
-        ae.asset_event_type.try(:active) && organization_ids.include?(ae.transam_asset.organization_id)
+        ae.asset_event_type.try(:active) && organization_ids.include?(ae.transam_asset.try(:organization_id))
       end
 
       cannot :create, DispositionUpdateEvent do |ae|

diff --git a/app/models/abilities/manager_asset_event_ability.rb b/app/models/abilities/manager_asset_event_ability.rb
@@ -9,7 +9,7 @@ def initialize(user)
       #-------------------------------------------------------------------------
       # managers can manage asset events if the asset's organization is in their list
       can :manage, AssetEvent do |ae|
-        ae.asset_event_type.try(:active) && user.organization_ids.include?(ae.asset.organization_id)
+        ae.asset_event_type.try(:active) && user.organization_ids.include?(ae.asset.try(:organization_id))
       end
 
       can :manage, EarlyDispositionRequestUpdateEvent do |ae|
@@ -26,7 +26,7 @@ def initialize(user)
 
       # managers can manage asset events if the asset's organization is in their list
       can :manage, AssetEvent do |ae|
-        ae.asset_event_type.try(:active) && user.organization_ids.include?(ae.transam_asset.organization_id)
+        ae.asset_event_type.try(:active) && user.organization_ids.include?(ae.transam_asset.try(:organization_id))
       end
 
       cannot :create, DispositionUpdateEvent do |ae|