Fix mispelling and ambiguous id in UserTeam.without_project
This commit is contained in:
parent
ca105d0462
commit
ca752e64fb
8 changed files with 6 additions and 13 deletions
|
@ -1,6 +1,6 @@
|
|||
class Projects::TeamsController < Projects::ApplicationController
|
||||
|
||||
def avaliable
|
||||
def available
|
||||
@teams = current_user.is_admin? ? UserTeam.scoped : current_user.user_teams
|
||||
@teams = @teams.without_project(project)
|
||||
unless @teams.any?
|
||||
|
|
|
@ -17,7 +17,7 @@ class UserTeam < ActiveRecord::Base
|
|||
|
||||
scope :with_member, ->(user){ joins(:user_team_user_relationships).where(user_team_user_relationships: {user_id: user.id}) }
|
||||
scope :with_project, ->(project){ joins(:user_team_project_relationships).where(user_team_project_relationships: {project_id: project})}
|
||||
scope :without_project, ->(project){ where("id NOT IN (:ids)", ids: (a = with_project(project); a.blank? ? 0 : a))}
|
||||
scope :without_project, ->(project){ where("user_teams.id NOT IN (:ids)", ids: (a = with_project(project); a.blank? ? 0 : a))}
|
||||
scope :created_by, ->(user){ where(owner_id: user) }
|
||||
|
||||
class << self
|
||||
|
|
|
@ -1,16 +1,12 @@
|
|||
.teams_box
|
||||
%h5.title
|
||||
My Teams
|
||||
Teams
|
||||
%small
|
||||
(#{@teams.count})
|
||||
%span.right
|
||||
= link_to new_team_path, class: "btn very_small info" do
|
||||
%i.icon-plus
|
||||
New Team
|
||||
%span.right
|
||||
= link_to teams_path, class: "btn very_small info" do
|
||||
%i.icon-user
|
||||
All Teams
|
||||
%ul.well-list
|
||||
- @teams.each do |team|
|
||||
%li
|
||||
|
|
|
@ -8,9 +8,6 @@
|
|||
%span.separator
|
||||
%h1.project_name= title
|
||||
%ul.nav
|
||||
%li
|
||||
= link_to teams_path, title: "Teams of users", class: 'has_bottom_tooltip', 'data-original-title' => 'Teams list' do
|
||||
%i.icon-group
|
||||
- if current_user.is_admin?
|
||||
%li
|
||||
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
%span.right
|
||||
= link_to import_project_team_members_path(@project), class: "btn small grouped", title: "Import team from another project" do
|
||||
Import team from another project
|
||||
= link_to avaliable_project_teams_path(@project), class: "btn small grouped", title: "Assign project to team of users" do
|
||||
= link_to available_project_teams_path(@project), class: "btn small grouped", title: "Assign project to team of users" do
|
||||
Assign project to Team of users
|
||||
= link_to new_project_team_member_path(@project), class: "btn success small grouped", title: "New Team Member" do
|
||||
New Team Member
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
= f.label :name do
|
||||
Team name is
|
||||
.input
|
||||
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
|
||||
= f.text_field :name, placeholder: "Ex. Ruby Developers", class: "xxlarge left"
|
||||
|
||||
= f.submit 'Create team', class: "btn primary"
|
||||
%hr
|
||||
|
|
|
@ -272,7 +272,7 @@ Gitlab::Application.routes.draw do
|
|||
scope module: :projects do
|
||||
resources :teams, only: [] do
|
||||
collection do
|
||||
get :avaliable
|
||||
get :available
|
||||
post :assign
|
||||
end
|
||||
member do
|
||||
|
|
Loading…
Add table
Reference in a new issue