Skip to content
Snippets Groups Projects
Verified Commit f8163c81 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Show shared projects on group page

parent 746ac56b
No related branches found
No related tags found
No related merge requests found
Loading
@@ -46,6 +46,8 @@ class GroupsController < Groups::ApplicationController
Loading
@@ -46,6 +46,8 @@ class GroupsController < Groups::ApplicationController
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
@projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
   
@shared_projects = @group.shared_projects
respond_to do |format| respond_to do |format|
format.html format.html
   
Loading
Loading
- if projects.present?
.panel.panel-default
.panel-heading
Projects shared with
%strong #{@group.name}
(#{projects.count})
%ul.well-list
- projects.each do |project|
%li.project-row
= link_to namespace_project_path(project.namespace, project), class: dom_class(project) do
%span.namespace-name
- if project.namespace
= project.namespace.human_name
\/
%span.project-name
= truncate(project.name, length: 25)
%span.arrow
%i.icon-angle-right
Loading
@@ -35,6 +35,10 @@
Loading
@@ -35,6 +35,10 @@
%li %li
= link_to "#projects", 'data-toggle' => 'tab' do = link_to "#projects", 'data-toggle' => 'tab' do
Projects Projects
- if @shared_projects.present?
%li
= link_to "#shared", 'data-toggle' => 'tab' do
Shared Projects
   
- if can?(current_user, :read_group, @group) - if can?(current_user, :read_group, @group)
%div{ class: container_class } %div{ class: container_class }
Loading
@@ -52,6 +56,9 @@
Loading
@@ -52,6 +56,9 @@
.tab-pane#projects .tab-pane#projects
= render "projects", projects: @projects = render "projects", projects: @projects
   
.tab-pane#shared
= render "shared_projects", projects: @shared_projects
- else - else
%p.nav-links.no-top %p.nav-links.no-top
No projects to show No projects to show
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment