Project

General

Profile

« Previous | Next » 

Revision fec952bd

Added by Dominic Cleal about 10 years ago

fixes #5489 - don't generate empty search () filters on permissions migration

View differences:

db/migrate/20140219183343_migrate_permissions.rb
# normal filters - domains, compute resource, hostgroup, facts
filter = filters[:domains].gsub('id', 'domain_id')
search = "(#{search}) #{user.domains_andor} (#{filter})" unless filter.blank?
if filter.present?
search = "(#{search}) #{user.domains_andor} " if search.present?
search = "#{search}(#{filter})"
end
filter = filters[:compute_resources].gsub('id', 'compute_resource_id')
search = "(#{search}) #{user.compute_resources_andor} (#{filter})" unless filter.blank?
if filter.present?
search = "(#{search}) #{user.compute_resources_andor} " if search.present?
search = "#{search}(#{filter})"
end
filter = filters[:hostgroups].gsub('id', 'hostgroup_id')
search = "(#{search}) #{user.hostgroups_andor} (#{filter})" unless filter.blank?
if filter.present?
search = "(#{search}) #{user.hostgroups_andor} " if search.present?
search = "#{search}(#{filter})"
end
filter = filters[:facts]
search = "(#{search}) #{user.facts_andor} (#{filter})" unless filter.blank?
if filter.present?
search = "(#{search}) #{user.facts_andor} " if search.present?
search = "#{search}(#{filter})"
end
# taxonomies
if SETTINGS[:organizations_enabled]
......
locs = user.locations
end
# fix first and/or that could appear
search = search.sub(/^\(\)\s*(and|or)\s*/, '')
[ search, orgs, locs ]
end

Also available in: Unified diff