diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-09 08:32:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-09 08:32:40 +0000 |
| commit | 059d1ae4c847aa9018c89900b39c2782aa9b623e (patch) | |
| tree | b545c97a885ec40ef238c168515629b251e40fbb /app/views/shared/projects | |
| parent | 3d20670058eba11b470bfd318a4842197b3bb122 (diff) | |
| parent | f39dbf3d3d4d5c99910043e8793a96246f0039fe (diff) | |
| download | gitlab-ce-059d1ae4c847aa9018c89900b39c2782aa9b623e.tar.gz | |
Merge branch 'dz-create-nested-groups-via-ui' into 'master'
Allow creating nested group via UI
See merge request !8786
Diffstat (limited to 'app/views/shared/projects')
| -rw-r--r-- | app/views/shared/projects/_dropdown.html.haml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/views/shared/projects/_dropdown.html.haml b/app/views/shared/projects/_dropdown.html.haml index ac028f18e50..c19697802ce 100644 --- a/app/views/shared/projects/_dropdown.html.haml +++ b/app/views/shared/projects/_dropdown.html.haml @@ -1,6 +1,7 @@ - @sort ||= sort_value_recently_updated - personal = params[:personal] - archived = params[:archived] +- shared = params[:shared] - namespace_id = params[:namespace_id] .dropdown - toggle_text = projects_sort_options_hash[@sort] @@ -28,3 +29,14 @@ %li = link_to filter_projects_path(namespace_id: namespace_id, sort: @sort, personal: true), class: ("is-active" if personal.present?) do Owned by me + - if @group && @group.shared_projects.present? + %li.divider + %li + = link_to filter_projects_path(namespace_id: namespace_id, sort: @sort, shared: nil), class: ("is-active" unless shared.present?) do + All projects + %li + = link_to filter_projects_path(namespace_id: namespace_id, sort: @sort, shared: 0), class: ("is-active" if shared == '0') do + Hide shared projects + %li + = link_to filter_projects_path(namespace_id: namespace_id, sort: @sort, shared: 1), class: ("is-active" if shared == '1') do + Hide group projects |