diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-09-04 20:01:58 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-10-04 22:46:49 +0200 |
| commit | 2eac1537ad907f2f7e628788cf980cb7e48d3f56 (patch) | |
| tree | ab22cb6965bbf1bf111cb9a8788524ac392f7f03 /app/views | |
| parent | ca538899b66a6a82582d2d590297cfef1d310dcf (diff) | |
| download | gitlab-ce-2eac1537ad907f2f7e628788cf980cb7e48d3f56.tar.gz | |
Fetch children using new finder for the `show` of a group.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/_children.html.haml | 4 | ||||
| -rw-r--r-- | app/views/groups/_show_nav.html.haml | 8 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/app/views/groups/_children.html.haml b/app/views/groups/_children.html.haml new file mode 100644 index 00000000000..e22d9cc6013 --- /dev/null +++ b/app/views/groups/_children.html.haml @@ -0,0 +1,4 @@ +- if children.any? + render children here +- else + .nothing-here-block No children found diff --git a/app/views/groups/_show_nav.html.haml b/app/views/groups/_show_nav.html.haml deleted file mode 100644 index 35b75bc0923..00000000000 --- a/app/views/groups/_show_nav.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -%ul.nav-links - = nav_link(page: group_path(@group)) do - = link_to group_path(@group) do - Projects - - if Group.supports_nested_groups? - = nav_link(page: subgroups_group_path(@group)) do - = link_to subgroups_group_path(@group) do - Subgroups diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 3ca63f9c3e0..a8842596dbd 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -8,7 +8,6 @@ .groups-header{ class: container_class } .top-area - = render 'groups/show_nav' .nav-controls = render 'shared/projects/search_form' = render 'shared/projects/dropdown' @@ -16,4 +15,4 @@ = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do New Project - = render "projects", projects: @projects + = render "children", children: @children |