Merge branch 'master' into 3634-tab-state

[arvados.git] / services / api / lib / eventbus.rb

diff --git a/services/api/lib/eventbus.rb b/services/api/lib/eventbus.rb
index 0b8cae2439c287b61b42d9d74274b03fed3ccfa3..50400ee86bf1b6827cbc64dddc024bf8d47e5364 100644 (file)
--- a/services/api/lib/eventbus.rb
+++ b/services/api/lib/eventbus.rb
@@ -72,14 +72,14 @@ class EventBus
           cond_out = []
           param_out = []
           ws.filters.each do |filter|
-            ft = record_filters filter.filters, Log.table_name
+            ft = record_filters filter.filters, Log
             cond_out += ft[:cond_out]
             param_out += ft[:param_out]
           end
 
           # Add filters to query
           if cond_out.any?
-            logs = logs.where(cond_out.join(' OR '), *param_out)
+            logs = logs.where('(' + cond_out.join(') OR (') + ')', *param_out)
           end
 
           # Finally execute query and actually send the matching log rows