Commit 1ce55d16 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

new team memeber selectbox replaced

parent 46e77db0
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
%table.round-borders#team-table %table.round-borders#team-table
%thead %thead
%th Name %th Name
%th Email
%th Web %th Web
%th Git %th Git
%th Admin %th Admin
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.span-6.append-bottom .span-6.append-bottom
%b Name %b Name
.span-6 .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 .span-6
%b Access: %b Access:
.span-6 .span-6
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
%td %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 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) = link_to truncate(user.name, :lenght => 24), project_team_member_path(@project, member)
%br
%td= truncate user.email, :lenght => 16 .cgray{:style => "padding-top:10px;"}= truncate user.email, :lenght => 24
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f| = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
%td= f.check_box :read, :onclick => "$(this.form).submit();" %td= f.check_box :read, :onclick => "$(this.form).submit();"
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
:plain :plain
$("#new_tm_dialog").empty(); $("#new_tm_dialog").empty();
$("#new_tm_dialog").append("#{escape_javascript(render('form'))}"); $("#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 @@ ...@@ -12,4 +12,4 @@
modal: true modal: true
}); });
$('select#team_member_user_id').selectmenu({width:300}); $('select#team_member_user_id').chosen();
...@@ -31,8 +31,8 @@ describe "TeamMembers" do ...@@ -31,8 +31,8 @@ describe "TeamMembers" do
describe "fill in" do describe "fill in" do
before do before do
click_link "Select user" page.execute_script("$('#team_member_user_id').show();")
click_link @user_1.name select @user_1.name, :from => "team_member_user_id"
within "#team_member_new" do within "#team_member_new" do
check "team_member_read" check "team_member_read"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment