diff options
| author | vanadium23 <chernoffivan@gmail.com> | 2017-06-16 08:28:23 +0300 |
|---|---|---|
| committer | vanadium23 <chernoffivan@gmail.com> | 2017-06-21 20:04:25 +0300 |
| commit | eda30f31041d883787959823b95c0ebef3c762ef (patch) | |
| tree | 200aede2a14bc14592249ba8812c2bf8000cae57 /lib | |
| parent | 043f8c260f49bb14f1c40ec563179c12c3df7828 (diff) | |
| download | gitlab-ce-eda30f31041d883787959823b95c0ebef3c762ef.tar.gz | |
Filter archived project in API v3 only if param present
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/v3/helpers.rb | 5 | ||||
| -rw-r--r-- | lib/api/v3/projects.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/api/v3/helpers.rb b/lib/api/v3/helpers.rb index d9e76560d03..4e63aa01c1a 100644 --- a/lib/api/v3/helpers.rb +++ b/lib/api/v3/helpers.rb @@ -38,7 +38,10 @@ module API projects = projects.where(visibility_level: Gitlab::VisibilityLevel.level_value(params[:visibility])) end - projects = projects.where(archived: params[:archived]) + unless params[:archived].nil? + projects = projects.where(archived: to_boolean(params[:archived])) + end + projects.reorder(params[:order_by] => params[:sort]) end end diff --git a/lib/api/v3/projects.rb b/lib/api/v3/projects.rb index 20976b9dd08..eb090453b48 100644 --- a/lib/api/v3/projects.rb +++ b/lib/api/v3/projects.rb @@ -69,7 +69,7 @@ module API end params :filter_params do - optional :archived, type: Boolean, default: false, desc: 'Limit by archived status' + optional :archived, type: Boolean, default: nil, desc: 'Limit by archived status' optional :visibility, type: String, values: %w[public internal private], desc: 'Limit by visibility' optional :search, type: String, desc: 'Return list of authorized projects matching the search criteria' |