Merge branch 'master' into story/115762063-show-historical-nested

This commit is contained in:
Stas 2016-05-18 16:48:14 +03:00
commit 368b9978ef
70 changed files with 1096 additions and 467 deletions

View file

@ -9,7 +9,7 @@ class Admin::DomainsController < AdminController
params[:q] ||= {}
if params[:statuses_contains]
domains = Domain.includes(:registrar, :registrant).where(
"statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
"domains.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
)
else
domains = Domain.includes(:registrar, :registrant)