replace or with ||

theforeman · Nov 27, 2016 · 7e4e3a5 · 7e4e3a5
1 parent 8012e3c
commit 7e4e3a5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
@@ -321,7 +321,7 @@ def parent_resource_details
         parent_class
       end
 
-      return nil if parent_name.nil? or parent_class.nil?
+      return nil if parent_name.nil? || parent_class.nil?
       parent_scope = scope_for(parent_class, :permission => "#{parent_permission(action_permission)}_#{parent_name.pluralize}")
       parent_scope = select_by_resource_id_scope(parent_scope, parent_class, parent_id)
       [parent_name, parent_scope]