Commit b7470440 authored by Andrey Kumanyaev's avatar Andrey Kumanyaev Committed by Dmitriy Zaporozhets

Move team project management to own controller

parent cca99359
No related merge requests found
class Admin::Teams::ProjectsController < Admin::Teams::ApplicationController
before_filter :team_project, only: [:edit, :destroy, :update]
def new
@projects = Project.scoped
@projects = @projects.without_team(@team) if @team.projects.any?
#@projects.reject!(&:empty_repo?)
end
def create
unless params[:project_ids].blank?
project_ids = params[:project_ids]
access = params[:greatest_project_access]
@team.assign_to_projects(project_ids, access)
end
redirect_to admin_team_path(@team), notice: 'Projects was successfully added.'
end
def edit
end
def update
if @team.update_project_access(@project, params[:greatest_project_access])
redirect_to admin_team_path(@team), notice: 'Membership was successfully updated.'
else
render :edit
end
end
def destroy
@team.resign_from_project(@project)
redirect_to admin_team_path(@team), notice: 'Project was successfully removed.'
end
private
def team_project
@project = @team.projects.find_by_path(params[:id])
end
end
module Admin::Teams::ProjectsHelper
def assigned_since(team, project)
team.user_team_project_relationships.find_by_project_id(project).created_at
end
end
...@@ -68,6 +68,10 @@ class UserTeam < ActiveRecord::Base ...@@ -68,6 +68,10 @@ class UserTeam < ActiveRecord::Base
Gitlab::UserTeamManager.update_team_user_membership(self, user, options) Gitlab::UserTeamManager.update_team_user_membership(self, user, options)
end end
def update_project_access(project, permission)
Gitlab::UserTeamManager.update_project_greates_access(self, project, permission)
end
def max_project_access(project) def max_project_access(project)
user_team_project_relationships.find_by_project_id(project).greatest_access user_team_project_relationships.find_by_project_id(project).greatest_access
end end
......
= form_tag admin_team_project_path(@team, @project), method: :put do
-if @project.errors.any?
.alert-message.block-message.error
%ul
- @project.errors.full_messages.each do |msg|
%li= msg
.clearfix
%label Max access for Team members:
.input
= select_tag :greatest_project_access, options_for_select(UserTeam.access_roles, @team.max_project_access(@project)), class: "project-access-select chosen span3"
%br
.actions
= submit_tag 'Save', class: "btn primary"
= link_to 'Cancel', :back, class: "btn"
%h3
Edit max access in #{@project.name} for #{@team.name} team
%hr
%table.zebra-striped
%tr
%td Project:
%td= @project.name
%tr
%td Team:
%td= @team.name
%tr
%td Since:
%td= assigned_since(@team, @project).stamp("Nov 11, 2010")
= render 'form'
%h3.page_title
Team: #{@team.name}
%fieldset
%legend Projects (#{@team.projects.count})
= form_tag admin_team_projects_path(@team), id: "assign_projects", class: "bulk_import", method: :post do
%table#projects_list
%thead
%tr
%th Project name
%th Max access
%th
- @team.projects.each do |project|
%tr.project
%td
= link_to project.name_with_namespace, [:admin, project]
%td
%span= @team.human_max_project_access(project)
%td
%tr
%td= select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
%td= select_tag :greatest_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
%td= submit_tag 'Add', class: "btn primary", id: :assign_projects_to_team
...@@ -78,6 +78,7 @@ Gitlab::Application.routes.draw do ...@@ -78,6 +78,7 @@ Gitlab::Application.routes.draw do
end end
scope module: :teams do scope module: :teams do
resources :members, only: [:edit, :update, :destroy, :new, :create] resources :members, only: [:edit, :update, :destroy, :new, :create]
resources :projects, only: [:edit, :update, :destroy, :new, :create]
end end
end end
resources :team_members, only: [:edit, :update, :destroy] resources :team_members, only: [:edit, :update, :destroy]
......
...@@ -48,6 +48,20 @@ module Gitlab ...@@ -48,6 +48,20 @@ module Gitlab
end end
end end
def update_project_greates_access(team, project, permission)
project_relation = team.user_team_project_relationships.find_by_project_id(project)
if permission != team.max_project_access(project)
if project_relation.update_attributes(greatest_access: permission)
update_team_users_access_in_project(team, project)
true
else
false
end
else
true
end
end
def rebuild_project_permissions_to_member(team, member) def rebuild_project_permissions_to_member(team, member)
team.projects.each do |project| team.projects.each do |project|
update_team_user_access_in_project(team, member, project) update_team_user_access_in_project(team, member, project)
......
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