Download as
Browse Code »

Commit 1587caa3e4d5b87e322612195a3db38212489c83

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

Use name+username in team -> new

Showing 4 changed files with 6 additions and 6 deletions   Show diff stats
app/decorators/user_decorator.rb
  Diff comments   View file @1587caa
... ... @@ -8,8 +8,4 @@ class UserDecorator < ApplicationDecorator
8 8 def tm_of(project)
9 9 project.team_member_by_id(self.id)
10 10 end
11   -
12   - def name_with_email
13   - "#{name} (#{email})"
14   - end
15 11 end
... ...
app/models/user.rb
  Diff comments   View file @1587caa
... ... @@ -340,4 +340,8 @@ class User < ActiveRecord::Base
340 340 def owned_teams
341 341 UserTeam.where(owner_id: self.id)
342 342 end
  343 +
  344 + def name_with_username
  345 + "#{name} (#{username})"
  346 + end
343 347 end
... ...
app/views/team_members/_form.html.haml
  Diff comments   View file @1587caa
... ... @@ -11,7 +11,7 @@
11 11 %h6 1. Choose people you want in the team
12 12 .clearfix
13 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 16 %h6 2. Set access level for them
17 17 .clearfix
... ...
app/views/teams/members/new.html.haml
  Diff comments   View file @1587caa
... ... @@ -20,7 +20,7 @@
20 20 %td= @team.admin?(member) ? "Admin" : "Member"
21 21 %td
22 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 24 %td= select_tag :default_project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3" }
25 25 %td
26 26 %span= check_box_tag :group_admin
... ...