Commit 1e3d238910fedb4c7de15a4c2f3537f0243059e4
1 parent
2753cea7
Exists in
master
and in
4 other branches
Replace short loop variable from "p" to "project"
Showing
3 changed files
with
7 additions
and
7 deletions
Show diff stats
app/controllers/admin/groups_controller.rb
| @@ -68,8 +68,8 @@ class Admin::GroupsController < AdminController | @@ -68,8 +68,8 @@ class Admin::GroupsController < AdminController | ||
| 68 | end | 68 | end |
| 69 | 69 | ||
| 70 | def project_teams_update | 70 | def project_teams_update |
| 71 | - @group.projects.each do |p| | ||
| 72 | - p.add_users_ids_to_team(params[:user_ids], params[:project_access]) | 71 | + @group.projects.each do |project| |
| 72 | + project.add_users_ids_to_team(params[:user_ids], params[:project_access]) | ||
| 73 | end | 73 | end |
| 74 | redirect_to [:admin, @group], notice: 'Users was successfully added.' | 74 | redirect_to [:admin, @group], notice: 'Users was successfully added.' |
| 75 | end | 75 | end |
app/controllers/groups_controller.rb
| @@ -59,8 +59,8 @@ class GroupsController < ApplicationController | @@ -59,8 +59,8 @@ class GroupsController < ApplicationController | ||
| 59 | end | 59 | end |
| 60 | 60 | ||
| 61 | def team_members | 61 | def team_members |
| 62 | - @group.projects.each do |p| | ||
| 63 | - p.add_users_ids_to_team(params[:user_ids], params[:project_access]) | 62 | + @group.projects.each do |project| |
| 63 | + project.add_users_ids_to_team(params[:user_ids], params[:project_access]) | ||
| 64 | end | 64 | end |
| 65 | redirect_to people_group_path(@group), notice: 'Users was successfully added.' | 65 | redirect_to people_group_path(@group), notice: 'Users was successfully added.' |
| 66 | end | 66 | end |
app/views/admin/groups/show.html.haml
| @@ -76,9 +76,9 @@ | @@ -76,9 +76,9 @@ | ||
| 76 | %tr{class: "user_#{u.id}"} | 76 | %tr{class: "user_#{u.id}"} |
| 77 | %td.name= link_to u.name, admin_user_path(u) | 77 | %td.name= link_to u.name, admin_user_path(u) |
| 78 | %td.projects_access | 78 | %td.projects_access |
| 79 | - - u.projects.in_group(@group).each do |p| | ||
| 80 | - - u_p = u.users_projects.in_project(p).first | ||
| 81 | - = "#{p.name} (#{link_to u_p.project_access_human, edit_admin_team_member_path(u_p) })".html_safe | 79 | + - u.projects.in_group(@group).each do |project| |
| 80 | + - u_p = u.users_projects.in_project(project).first | ||
| 81 | + = "#{project.name} (#{link_to u_p.project_access_human, edit_admin_team_member_path(u_p) })".html_safe | ||
| 82 | %tr | 82 | %tr |
| 83 | %td.input= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5' | 83 | %td.input= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5' |
| 84 | %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"} | 84 | %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"} |