diff options
Diffstat (limited to 'app/finders/labels_finder.rb')
| -rw-r--r-- | app/finders/labels_finder.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/finders/labels_finder.rb b/app/finders/labels_finder.rb index 027cdc4fc78..e726772fba4 100644 --- a/app/finders/labels_finder.rb +++ b/app/finders/labels_finder.rb @@ -46,7 +46,6 @@ class LabelsFinder < UnionFinder end else if group? - group = Group.find(params[:group_id]) label_ids << Label.where(group_id: group_ids_for(group)) end @@ -123,7 +122,11 @@ class LabelsFinder < UnionFinder end def group? - params[:group_id].present? + params[:group].present? || params[:group_id].present? + end + + def group + strong_memoize(:group) { params[:group].presence || Group.find(params[:group_id]) } end def project? @@ -169,7 +172,7 @@ class LabelsFinder < UnionFinder ProjectsFinder.new(params: { non_archived: true }, current_user: current_user).execute # rubocop: disable CodeReuse/Finder end - @projects = @projects.in_namespace(params[:group_id]) if group? + @projects = @projects.in_namespace(group.id) if group? @projects = @projects.where(id: params[:project_ids]) if projects? @projects = @projects.reorder(nil) |