Commit 1587caa3e4d5b87e322612195a3db38212489c83
1 parent
fa9a8c38
Exists in
master
and in
4 other branches
Use name+username in team -> new
Showing
4 changed files
with
6 additions
and
6 deletions
Show diff stats
app/decorators/user_decorator.rb
| @@ -8,8 +8,4 @@ class UserDecorator < ApplicationDecorator | @@ -8,8 +8,4 @@ class UserDecorator < ApplicationDecorator | ||
| 8 | def tm_of(project) | 8 | def tm_of(project) |
| 9 | project.team_member_by_id(self.id) | 9 | project.team_member_by_id(self.id) |
| 10 | end | 10 | end |
| 11 | - | ||
| 12 | - def name_with_email | ||
| 13 | - "#{name} (#{email})" | ||
| 14 | - end | ||
| 15 | end | 11 | end |
app/models/user.rb
| @@ -340,4 +340,8 @@ class User < ActiveRecord::Base | @@ -340,4 +340,8 @@ class User < ActiveRecord::Base | ||
| 340 | def owned_teams | 340 | def owned_teams |
| 341 | UserTeam.where(owner_id: self.id) | 341 | UserTeam.where(owner_id: self.id) |
| 342 | end | 342 | end |
| 343 | + | ||
| 344 | + def name_with_username | ||
| 345 | + "#{name} (#{username})" | ||
| 346 | + end | ||
| 343 | end | 347 | end |
app/views/team_members/_form.html.haml
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | %h6 1. Choose people you want in the team | 11 | %h6 1. Choose people you want in the team |
| 12 | .clearfix | 12 | .clearfix |
| 13 | = f.label :user_ids, "People" | 13 | = f.label :user_ids, "People" |
| 14 | - .input= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).alphabetically, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true}) | 14 | + .input= select_tag(:user_ids, options_from_collection_for_select(User.active.not_in_project(@project).alphabetically, :id, :name_with_username), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true}) |
| 15 | 15 | ||
| 16 | %h6 2. Set access level for them | 16 | %h6 2. Set access level for them |
| 17 | .clearfix | 17 | .clearfix |
app/views/teams/members/new.html.haml
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | %td= @team.admin?(member) ? "Admin" : "Member" | 20 | %td= @team.admin?(member) ? "Admin" : "Member" |
| 21 | %td | 21 | %td |
| 22 | %tr | 22 | %tr |
| 23 | - %td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_email), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5' | 23 | + %td= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name_with_username), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5' |
| 24 | %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" } | 24 | %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" } |
| 25 | %td | 25 | %td |
| 26 | %span= check_box_tag :group_admin | 26 | %span= check_box_tag :group_admin |