Download as
Browse Code »

Commit 5d8ca6e60b8cbbb08222e4e5b93ed8c4592d051a

Authored by Dmitriy Zaporozhets
1 parent 3b0d7a30
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Remove deprecated models

Showing 3 changed files with 0 additions and 198 deletions   Show diff stats
app/models/deprecated/user_team.rb
View file @3b0d7a3
... ... @@ -1,118 +0,0 @@
1   -# Will be removed in 6.1 with tables
2   -#
3   -# == Schema Information
4   -#
5   -# Table name: user_teams
6   -#
7   -# id :integer not null, primary key
8   -# name :string(255)
9   -# path :string(255)
10   -# owner_id :integer
11   -# created_at :datetime not null
12   -# updated_at :datetime not null
13   -# description :string(255) default(""), not null
14   -#
15   -
16   -class UserTeam < ActiveRecord::Base
17   - attr_accessible :name, :description, :owner_id, :path
18   -
19   - belongs_to :owner, class_name: User
20   -
21   - has_many :user_team_project_relationships, dependent: :destroy
22   - has_many :user_team_user_relationships, dependent: :destroy
23   -
24   - has_many :projects, through: :user_team_project_relationships
25   - has_many :members, through: :user_team_user_relationships, source: :user
26   -
27   - validates :owner, presence: true
28   - validates :name, presence: true, uniqueness: true,
29   - length: { within: 0..255 },
30   - format: { with: Gitlab::Regex.name_regex,
31   - message: "only letters, digits, spaces & '_' '-' '.' allowed." }
32   - validates :description, length: { within: 0..255 }
33   - validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
34   - format: { with: Gitlab::Regex.path_regex,
35   - message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
36   -
37   - scope :with_member, ->(user){ joins(:user_team_user_relationships).where(user_team_user_relationships: {user_id: user.id}) }
38   - scope :with_project, ->(project){ joins(:user_team_project_relationships).where(user_team_project_relationships: {project_id: project})}
39   - scope :without_project, ->(project){ where("user_teams.id NOT IN (:ids)", ids: (a = with_project(project); a.blank? ? 0 : a))}
40   - scope :created_by, ->(user){ where(owner_id: user) }
41   -
42   - class << self
43   - def search query
44   - where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
45   - end
46   -
47   - def global_id
48   - 'GLN'
49   - end
50   -
51   - def access_roles
52   - UsersProject.access_roles
53   - end
54   - end
55   -
56   - def to_param
57   - path
58   - end
59   -
60   - def assign_to_projects(projects, access)
61   - projects.each do |project|
62   - assign_to_project(project, access)
63   - end
64   - end
65   -
66   - def assign_to_project(project, access)
67   - Gitlab::UserTeamManager.assign(self, project, access)
68   - end
69   -
70   - def resign_from_project(project)
71   - Gitlab::UserTeamManager.resign(self, project)
72   - end
73   -
74   - def add_members(users, access, group_admin)
75   - # reject existing users
76   - users.reject! { |id| member_ids.include?(id.to_i) }
77   -
78   - users.each do |user|
79   - add_member(user, access, group_admin)
80   - end
81   - end
82   -
83   - def add_member(user, access, group_admin)
84   - Gitlab::UserTeamManager.add_member_into_team(self, user, access, group_admin)
85   - end
86   -
87   - def remove_member(user)
88   - Gitlab::UserTeamManager.remove_member_from_team(self, user)
89   - end
90   -
91   - def update_membership(user, options)
92   - Gitlab::UserTeamManager.update_team_user_membership(self, user, options)
93   - end
94   -
95   - def update_project_access(project, permission)
96   - Gitlab::UserTeamManager.update_project_greates_access(self, project, permission)
97   - end
98   -
99   - def max_project_access(project)
100   - user_team_project_relationships.find_by_project_id(project).greatest_access
101   - end
102   -
103   - def human_max_project_access(project)
104   - self.class.access_roles.invert[max_project_access(project)]
105   - end
106   -
107   - def default_projects_access(member)
108   - user_team_user_relationships.find_by_user_id(member).permission
109   - end
110   -
111   - def human_default_projects_access(member)
112   - self.class.access_roles.invert[default_projects_access(member)]
113   - end
114   -
115   - def admin?(member)
116   - user_team_user_relationships.with_user(member).first.try(:group_admin?)
117   - end
118   -end
app/models/deprecated/user_team_project_relationship.rb
View file @3b0d7a3
... ... @@ -1,46 +0,0 @@
1   -# Will be removed in 6.1 with tables
2   -#
3   -# == Schema Information
4   -#
5   -# Table name: user_team_project_relationships
6   -#
7   -# id :integer not null, primary key
8   -# project_id :integer
9   -# user_team_id :integer
10   -# greatest_access :integer
11   -# created_at :datetime not null
12   -# updated_at :datetime not null
13   -#
14   -
15   -class UserTeamProjectRelationship < ActiveRecord::Base
16   - attr_accessible :greatest_access, :project_id, :user_team_id
17   -
18   - belongs_to :user_team
19   - belongs_to :project
20   -
21   - validates :project, presence: true
22   - validates :user_team, presence: true
23   - validate :check_greatest_access
24   -
25   - scope :with_project, ->(project){ where(project_id: project.id) }
26   -
27   - def team_name
28   - user_team.name
29   - end
30   -
31   - def human_max_access
32   - UserTeam.access_roles.key(greatest_access)
33   - end
34   -
35   - private
36   -
37   - def check_greatest_access
38   - errors.add(:base, :incorrect_access_code) unless correct_access?
39   - end
40   -
41   - def correct_access?
42   - return false if greatest_access.blank?
43   - return true if UsersProject.access_roles.has_value?(greatest_access)
44   - false
45   - end
46   -end
app/models/deprecated/user_team_user_relationship.rb
View file @3b0d7a3
... ... @@ -1,34 +0,0 @@
1   -# Will be removed in 6.1 with tables
2   -#
3   -# == Schema Information
4   -#
5   -# Table name: user_team_user_relationships
6   -#
7   -# id :integer not null, primary key
8   -# user_id :integer
9   -# user_team_id :integer
10   -# group_admin :boolean
11   -# permission :integer
12   -# created_at :datetime not null
13   -# updated_at :datetime not null
14   -#
15   -
16   -class UserTeamUserRelationship < ActiveRecord::Base
17   - attr_accessible :group_admin, :permission, :user_id, :user_team_id
18   -
19   - belongs_to :user_team
20   - belongs_to :user
21   -
22   - validates :user_team, presence: true
23   - validates :user, presence: true
24   -
25   - scope :with_user, ->(user) { where(user_id: user.id) }
26   -
27   - def user_name
28   - user.name
29   - end
30   -
31   - def access_human
32   - UsersProject.access_roles.invert[permission]
33   - end
34   -end