Commit a7026369 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Show real shared projects at group page

parent 909e479e
...@@ -34,6 +34,8 @@ class GroupsController < ApplicationController ...@@ -34,6 +34,8 @@ class GroupsController < ApplicationController
@events = Event.in_projects(project_ids).limit(20).offset(params[:offset] || 0) @events = Event.in_projects(project_ids).limit(20).offset(params[:offset] || 0)
@last_push = current_user.recent_push @last_push = current_user.recent_push
@shared_projects = @group.shared_projects
respond_to do |format| respond_to do |format|
format.html format.html
format.js format.js
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
class Projects::GroupLinksController < Projects::ApplicationController class Projects::GroupLinksController < Projects::ApplicationController
layout 'project_settings' layout 'project_settings'
before_filter :authorize_admin_project!
def index def index
@group_links = project.project_group_links.all @group_links = project.project_group_links.all
......
...@@ -16,6 +16,9 @@ class Group < Namespace ...@@ -16,6 +16,9 @@ class Group < Namespace
has_many :users_groups, dependent: :destroy has_many :users_groups, dependent: :destroy
has_many :users, through: :users_groups has_many :users, through: :users_groups
has_many :project_group_links, dependent: :destroy
has_many :shared_projects, through: :project_group_links, source: 'project'
after_create :add_owner after_create :add_owner
def human_name def human_name
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= @group.description = @group.description
= render "projects", projects: @projects = render "projects", projects: @projects
%br %br
= render "shared_projects", projects: Project.first(3) = render "shared_projects", projects: @shared_projects
.prepend-top-20 .prepend-top-20
= link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment