From 63900c1dcfa477ab573e7fd57d8b3e5cc2ecf6cf Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Mon, 13 Jun 2016 08:01:46 -0600 Subject: Pass can_edit and access to partial. --- app/views/layouts/nav/_project.html.haml | 2 +- app/views/layouts/nav/_project_settings.html.haml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index cc2825932d9..155fd1792ce 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -7,7 +7,7 @@ = icon('cog') = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right - = render 'layouts/nav/project_settings' + = render 'layouts/nav/project_settings', access: access, can_edit: can_edit - if can_edit || access %li.divider - if can_edit diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml index d26f89bdf17..13d32bd1354 100644 --- a/app/views/layouts/nav/_project_settings.html.haml +++ b/app/views/layouts/nav/_project_settings.html.haml @@ -1,5 +1,3 @@ -- access = user_max_access_in_project(current_user.id, @project) -- can_edit = can?(current_user, :admin_project, @project) - if project_nav_tab? :team = nav_link(controller: [:project_members, :teams]) do = link_to namespace_project_project_members_path(@project.namespace, @project), title: 'Members', class: 'team-tab tab' do -- cgit v1.2.1