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
ecf7640b
Commit
ecf7640b
authored
Sep 07, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed group_links expire date not updating in view
parent
401b7976
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/projects/group_links/update.js.haml
app/views/projects/group_links/update.js.haml
+1
-1
spec/features/projects/members/group_links_spec.rb
spec/features/projects/members/group_links_spec.rb
+1
-1
No files found.
app/views/projects/group_links/update.js.haml
View file @
ecf7640b
:plain
:plain
var $listItem = $('
#{
escape_javascript
(
render
(
'shared/members/group'
,
group_link:
@group_link
,
group:
@group_link
.
group
))
}
');
var $listItem = $('
#{
escape_javascript
(
render
(
'shared/members/group'
,
group_link:
@group_link
,
group:
@group_link
.
group
))
}
');
$("#
#{dom_id(@group_link.group)
} .list-item-name").replaceWith($listItem.find('.list-item-name'));
$("#
group_member_
#{
@group_link
.
id
}
.list-item-name").replaceWith($listItem.find('.list-item-name'));
spec/features/projects/members/group_links_spec.rb
View file @
ecf7640b
...
@@ -30,7 +30,7 @@ feature 'Projects > Members > Anonymous user sees members', feature: true, js: t
...
@@ -30,7 +30,7 @@ feature 'Projects > Members > Anonymous user sees members', feature: true, js: t
fill_in
"member_expires_at_
#{
group
.
id
}
"
,
with:
tomorrow
.
strftime
(
"%F"
)
fill_in
"member_expires_at_
#{
group
.
id
}
"
,
with:
tomorrow
.
strftime
(
"%F"
)
wait_for_ajax
wait_for_ajax
page
.
within
(
fi
rst
(
'li.
member'
))
do
page
.
within
(
fi
nd
(
'li.group_
member'
))
do
expect
(
page
).
to
have_content
(
'Expires in'
)
expect
(
page
).
to
have_content
(
'Expires in'
)
end
end
end
end
...
...
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