new team memeber selectbox replaced
This commit is contained in:
parent
46e77db099
commit
1ce55d161a
6 changed files with 8 additions and 9 deletions
|
@ -5,7 +5,6 @@
|
|||
%table.round-borders#team-table
|
||||
%thead
|
||||
%th Name
|
||||
%th Email
|
||||
%th Web
|
||||
%th Git
|
||||
%th Admin
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
.span-6.append-bottom
|
||||
%b Name
|
||||
.span-6
|
||||
= f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
|
||||
= f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, { :style => "width:300px" })
|
||||
.span-6
|
||||
%b Access:
|
||||
.span-6
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
%td
|
||||
= link_to image_tag(gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"), project_team_member_path(@project, member)
|
||||
|
||||
= link_to truncate(user.name, :lenght => 16), project_team_member_path(@project, member)
|
||||
|
||||
%td= truncate user.email, :lenght => 16
|
||||
= link_to truncate(user.name, :lenght => 24), project_team_member_path(@project, member)
|
||||
%br
|
||||
.cgray{:style => "padding-top:10px;"}= truncate user.email, :lenght => 24
|
||||
- if can? current_user, :admin_project, @project
|
||||
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
|
||||
%td= f.check_box :read, :onclick => "$(this.form).submit();"
|
||||
|
|
|
@ -6,4 +6,4 @@
|
|||
:plain
|
||||
$("#new_tm_dialog").empty();
|
||||
$("#new_tm_dialog").append("#{escape_javascript(render('form'))}");
|
||||
$('select#team_member_user_id').selectmenu({width:300});
|
||||
$('select#team_member_user_id').chosen();
|
||||
|
|
|
@ -12,4 +12,4 @@
|
|||
modal: true
|
||||
|
||||
});
|
||||
$('select#team_member_user_id').selectmenu({width:300});
|
||||
$('select#team_member_user_id').chosen();
|
||||
|
|
|
@ -31,8 +31,8 @@ describe "TeamMembers" do
|
|||
|
||||
describe "fill in" do
|
||||
before do
|
||||
click_link "Select user"
|
||||
click_link @user_1.name
|
||||
page.execute_script("$('#team_member_user_id').show();")
|
||||
select @user_1.name, :from => "team_member_user_id"
|
||||
|
||||
within "#team_member_new" do
|
||||
check "team_member_read"
|
||||
|
|
Loading…
Reference in a new issue