Skip to content

Commit

Permalink
fixed the link errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jaisejose1123 committed Apr 8, 2024
1 parent a607d24 commit 070bf88
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions lib/rbac/filterer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ def search(options = {})
auth_count = inner_scope.except(:offset, :limit, :order).count(:all)
end
end
targets = scope unless targets[0][:objectIds].present?

targets = scope if targets[0][:objectIds].blank?

unless options[:skip_counts]
auth_count ||= attrs[:apply_limit_in_sql] && limit ? targets.except(:offset, :limit, :order).count(:all) : targets.length
end
Expand All @@ -368,14 +368,10 @@ def search(options = {})
end
targets = targets.drop(offset.to_i).take(limit.to_i)
end

# Preserve sort order of incoming target_ids
if !target_ids.nil? && !order
if targets.kind_of?(Array)
targets = targets
else
targets = targets.sort_by { |a| target_ids.index(a.id) }
end
if !target_ids.nil? && !order && !targets.kind_of?(Array)
targets = targets.sort_by { |a| target_ids.index(a.id) }
end
targets = targets.to_a if targets.kind_of?(Enumerator::Lazy)

Expand Down Expand Up @@ -512,7 +508,7 @@ def rbac_class(scope)
# So once calc_filtered_ids uses pluck_ids for all, then that filter
# can converted across to a 100% sql friendly query
def pluck_ids(targets)
targets.pluck(:id) if targets
targets&.pluck(:id)
end

def self_service_ownership_scope?(miq_group, klass)
Expand Down Expand Up @@ -596,14 +592,14 @@ def scope_by_ids(scope, filtered_ids)
end

def get_belongsto_filter_object_ids(klass, filter)
return nil if !BELONGSTO_FILTER_CLASSES.include?(safe_base_class(klass).name) || filter.blank?
return nil if BELONGSTO_FILTER_CLASSES.exclude?(safe_base_class(klass).name) || filter.blank?

get_belongsto_matches(filter, rbac_class(klass)).collect(&:id)
end

def get_managed_filter_object_ids(scope, filter)
klass = scope.respond_to?(:klass) ? scope.klass : scope
return nil if !TAGGABLE_FILTER_CLASSES.include?(safe_base_class(klass).name) || filter.blank?
return nil if TAGGABLE_FILTER_CLASSES.exclude?(safe_base_class(klass).name) || filter.blank?
return scope.where(filter.to_sql.first) if filter.kind_of?(MiqExpression)

scope.find_tags_by_grouping(filter, :ns => '*').reorder(nil)
Expand Down Expand Up @@ -930,4 +926,3 @@ def matches_search_filters?(obj, filter, timezone, prune_sql: true)
end
end
end

0 comments on commit 070bf88

Please sign in to comment.