Skip to content

Commit

Permalink
Fixes #30079 - workaround for ISE when search terms are used without …
Browse files Browse the repository at this point in the history
…true/false expression
  • Loading branch information
James Jeffers committed Sep 2, 2020
1 parent 89f1bb6 commit 8a1c4fa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module SubscriptionFacetHostExtensions
scoped_search :relation => :activation_keys, :on => :name, :rename => :activation_key, :complete_value => true, :ext_method => :find_by_activation_key
scoped_search :relation => :activation_keys, :on => :id, :rename => :activation_key_id, :complete_value => true, :ext_method => :find_by_activation_key_id,
:only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
scoped_search :on => :hypervisor, :relation => :subscription_facet, :complete_value => { :true => true, :false => false }
scoped_search :on => :hypervisor, :relation => :subscription_facet, :complete_value => true
scoped_search :on => :name, :relation => :hypervisor_host, :complete_value => true, :rename => :hypervisor_host, :ext_method => :find_by_hypervisor_host
scoped_search :on => :name, :relation => :subscriptions, :rename => :subscription_name, :complete_value => true, :ext_method => :find_by_subscription_name
scoped_search :on => :id, :relation => :pools, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id, :only_explicit => true
Expand Down
2 changes: 1 addition & 1 deletion app/models/katello/content_view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class ContentView < Katello::Model
scoped_search :on => :name, :complete_value => true
scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
scoped_search :on => :label, :complete_value => true
scoped_search :on => :composite, :complete_value => {true: true, false: false}
scoped_search :on => :composite, :complete_value => true

def self.in_environment(env)
joins(:content_view_environments).
Expand Down

0 comments on commit 8a1c4fa

Please sign in to comment.