diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-02 19:34:16 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-06 03:05:39 +0300 |
| commit | a973640d9210d91000c60d94b992543d6febbbc6 (patch) | |
| tree | d435f2e4dd003fd411c903ea9885d2cbcab19c96 | |
| parent | 6f64d041e9508577c34bf349fdbb94a0d027014c (diff) | |
Merge branch 'member-expiration-date-on-update' into 'master'
Fix expiration date picker after update
@DouweM this object is now on `gl`, not on the window. It would only break when trying to use the date picker on a newly-inserted member element, but I figure it's probably worth sneaking into a patch.
See merge request !6184
| -rw-r--r-- | app/views/groups/group_members/update.js.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/update.js.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/group_members/update.js.haml b/app/views/groups/group_members/update.js.haml index 742f9d7a433..3be7ed8432c 100644 --- a/app/views/groups/group_members/update.js.haml +++ b/app/views/groups/group_members/update.js.haml @@ -1,3 +1,3 @@ :plain $("##{dom_id(@group_member)}").replaceWith('#{escape_javascript(render('shared/members/member', member: @group_member))}'); - new MemberExpirationDate(); + new gl.MemberExpirationDate(); diff --git a/app/views/projects/project_members/update.js.haml b/app/views/projects/project_members/update.js.haml index 833954bc039..37e55dc72a3 100644 --- a/app/views/projects/project_members/update.js.haml +++ b/app/views/projects/project_members/update.js.haml @@ -1,3 +1,3 @@ :plain $("##{dom_id(@project_member)}").replaceWith('#{escape_javascript(render('shared/members/member', member: @project_member))}'); - new MemberExpirationDate(); + new gl.MemberExpirationDate(); |