diff options
| author | Andrey Kumanyaev <me@zzet.org> | 2012-12-26 14:22:12 +0400 |
|---|---|---|
| committer | Andrey Kumanyaev <me@zzet.org> | 2012-12-26 19:52:16 +0400 |
| commit | 634783feb0131794eb1ed797a8c70e1674f9ba9e (patch) | |
| tree | 67590b982baf918744b887d3a97d61f5316c6aaf | |
| parent | 1e3d238910fedb4c7de15a4c2f3537f0243059e4 (diff) | |
| download | gitlab-ce-634783feb0131794eb1ed797a8c70e1674f9ba9e.tar.gz | |
Rename scope "in_group" to "in_namespace"
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index f5ff3e09b63..bfab009e94a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -82,7 +82,7 @@ class Project < ActiveRecord::Base scope :public_only, where(private_flag: false) scope :without_user, ->(user) { where("id NOT IN (:ids)", ids: user.projects.map(&:id) ) } scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) } - scope :in_group, ->(group) { where(namespace_id: group.id) } + scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) } scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") } scope :personal, ->(user) { where(namespace_id: user.namespace_id) } scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) } diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 86850722de8..f08d5752135 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -76,7 +76,7 @@ %tr{class: "user_#{u.id}"} %td.name= link_to u.name, admin_user_path(u) %td.projects_access - - u.projects.in_group(@group).each do |project| + - u.projects.in_namespace(@group).each do |project| - u_p = u.users_projects.in_project(project).first = "#{project.name} (#{link_to u_p.project_access_human, edit_admin_team_member_path(u_p) })".html_safe %tr |