Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1ce55d16
Commit
1ce55d16
authored
Nov 30, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new team memeber selectbox replaced
parent
46e77db0
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
9 deletions
+8
-9
app/views/projects/_team.html.haml
app/views/projects/_team.html.haml
+0
-1
app/views/team_members/_form.html.haml
app/views/team_members/_form.html.haml
+1
-1
app/views/team_members/_show.html.haml
app/views/team_members/_show.html.haml
+3
-3
app/views/team_members/create.js.haml
app/views/team_members/create.js.haml
+1
-1
app/views/team_members/new.js.haml
app/views/team_members/new.js.haml
+1
-1
spec/requests/team_members_spec.rb
spec/requests/team_members_spec.rb
+2
-2
No files found.
app/views/projects/_team.html.haml
View file @
1ce55d16
...
@@ -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
...
...
app/views/team_members/_form.html.haml
View file @
1ce55d16
...
@@ -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
...
...
app/views/team_members/_show.html.haml
View file @
1ce55d16
...
@@ -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();"
...
...
app/views/team_members/create.js.haml
View file @
1ce55d16
...
@@ -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(
);
app/views/team_members/new.js.haml
View file @
1ce55d16
...
@@ -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(
);
spec/requests/team_members_spec.rb
View file @
1ce55d16
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment