From 7e4e3a5f432a357dea3740db06690263fb44e651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sun, 27 Nov 2016 17:20:27 +0100 Subject: [PATCH] replace or with || --- app/controllers/api/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index c1a819fc3f1..e96662423ed 100644 --- 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]