Project

General

Profile

« Previous | Next » 

Revision c577937c

Added by Daniel Lobato Garcia over 8 years ago

Fixes #11379 - Audit search for hostgroup/OS title

Before this commit, hostgroup and OS could only be searched by name,
which is impractical as names are not unique. As we do on Hosts search,
I've added hostgroup_title and os_title as keys to search on /audits.

View differences:

app/models/concerns/audit_extensions.rb
scoped_search :in => :search_parameters, :on => :name, :complete_value => true, :rename => :parameter, :only_explicit => true
scoped_search :in => :search_templates, :on => :name, :complete_value => true, :rename => :template, :only_explicit => true
scoped_search :in => :search_os, :on => :name, :complete_value => true, :rename => :os, :only_explicit => true
scoped_search :in => :search_os, :on => :title, :complete_value => true, :rename => :os_title, :only_explicit => true
scoped_search :in => :search_class, :on => :name, :complete_value => true, :rename => :puppetclass, :only_explicit => true
scoped_search :in => :search_hosts, :on => :name, :complete_value => true, :rename => :host, :only_explicit => true
scoped_search :in => :search_hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup, :only_explicit => true
scoped_search :in => :search_hostgroups, :on => :title, :complete_value => true, :rename => :hostgroup_title, :only_explicit => true
scoped_search :in => :search_users, :on => :login, :complete_value => true, :rename => :user, :only_explicit => true
before_save :ensure_username, :ensure_audtiable_and_associated_name
before_save :ensure_username, :ensure_auditable_and_associated_name
after_validation :fix_auditable_type
include Authorizable
......
self.associated_type = auditable.type if auditable_type == "Taxonomy" && auditable
end
def ensure_audtiable_and_associated_name
def ensure_auditable_and_associated_name
self.auditable_name ||= self.auditable.try(:to_label)
self.associated_name ||= self.associated.try(:to_label)
end

Also available in: Unified diff