diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 21:10:18 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-06 21:10:18 +0000 |
| commit | 096c38a822bc60f9e0ff9a5266d5bae95f187cc3 (patch) | |
| tree | eec39bb52267105e38ee8f5266aca41148c1e3af /app/finders/packages | |
| parent | 653048c5eeb8351344155d5e03a7d5a6138ba6ec (diff) | |
| download | gitlab-ce-096c38a822bc60f9e0ff9a5266d5bae95f187cc3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders/packages')
| -rw-r--r-- | app/finders/packages/group_packages_finder.rb | 8 | ||||
| -rw-r--r-- | app/finders/packages/packages_finder.rb | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/finders/packages/group_packages_finder.rb b/app/finders/packages/group_packages_finder.rb index a51057571f1..860c4068b31 100644 --- a/app/finders/packages/group_packages_finder.rb +++ b/app/finders/packages/group_packages_finder.rb @@ -27,9 +27,9 @@ module Packages .including_tags .for_projects(group_projects_visible_to_current_user.select(:id)) .processed - .has_version .sort_by_attribute("#{params[:order_by]}_#{params[:sort]}") + packages = filter_with_version(packages) packages = filter_by_package_type(packages) packages = filter_by_package_name(packages) packages @@ -72,5 +72,11 @@ module Packages packages.search_by_name(params[:package_name]) end + + def filter_with_version(packages) + return packages if params[:include_versionless].present? + + packages.has_version + end end end diff --git a/app/finders/packages/packages_finder.rb b/app/finders/packages/packages_finder.rb index 519e8bf9c34..72a63224d2f 100644 --- a/app/finders/packages/packages_finder.rb +++ b/app/finders/packages/packages_finder.rb @@ -18,7 +18,7 @@ module Packages .including_project_route .including_tags .processed - .has_version + packages = filter_with_version(packages) packages = filter_by_package_type(packages) packages = filter_by_package_name(packages) packages = order_packages(packages) @@ -27,6 +27,12 @@ module Packages private + def filter_with_version(packages) + return packages if params[:include_versionless].present? + + packages.has_version + end + def filter_by_package_type(packages) return packages unless params[:package_type] |