diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:01:50 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-18 21:09:17 +0100 |
| commit | 396f85e438ddc9bcd89f5a557980ce82b71e098b (patch) | |
| tree | 107f557ebf32d9cb76111edb36c656c54d80f5cc /app/views | |
| parent | 8b1656282bcc39a0c1c7a3dccf74c98b1c3adae2 (diff) | |
| download | gitlab-ce-396f85e438ddc9bcd89f5a557980ce82b71e098b.tar.gz | |
Add expiration date to group memberships
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/group_members/_new_group_member.html.haml | 7 | ||||
| -rw-r--r-- | app/views/groups/group_members/update.js.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 13 |
3 files changed, 14 insertions, 7 deletions
diff --git a/app/views/groups/group_members/_new_group_member.html.haml b/app/views/groups/group_members/_new_group_member.html.haml index 9bb9f962177..33228f31786 100644 --- a/app/views/groups/group_members/_new_group_member.html.haml +++ b/app/views/groups/group_members/_new_group_member.html.haml @@ -14,5 +14,12 @@ Read more about role permissions %strong= link_to "here", help_page_path("user/permissions"), class: "vlink" + .form-group + = f.label :expires_at, 'Access expiration date', class: 'control-label' + .col-sm-10 + .clearable-input + = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Select access expiration date' + %i.clear-icon.js-clear-input + .form-actions = f.submit 'Add users to group', class: "btn btn-create" diff --git a/app/views/groups/group_members/update.js.haml b/app/views/groups/group_members/update.js.haml index da71de4cd1e..742f9d7a433 100644 --- a/app/views/groups/group_members/update.js.haml +++ b/app/views/groups/group_members/update.js.haml @@ -1,2 +1,3 @@ :plain $("##{dom_id(@group_member)}").replaceWith('#{escape_javascript(render('shared/members/member', member: @group_member))}'); + new MemberExpirationDate(); diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 2adbf9277fa..09f53268747 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -82,12 +82,11 @@ = label_tag "member_access_level_#{member.id}", 'Project access', class: 'control-label' .col-sm-10 = f.select :access_level, options_for_select(member.class.access_level_roles, member.access_level), {}, class: 'form-control', id: "member_access_level_#{member.id}" - - if member.is_a?(ProjectMember) - .form-group - = label_tag "member_expires_at_#{member.id}", 'Access expiration date', class: 'control-label' - .col-sm-10 - .clearable-input - = f.text_field :expires_at, class: 'form-control js-access-expiration-date', placeholder: 'Select access expiration date', id: "member_expires_at_#{member.id}" - %i.clear-icon.js-clear-input + .form-group + = label_tag "member_expires_at_#{member.id}", 'Access expiration date', class: 'control-label' + .col-sm-10 + .clearable-input + = f.text_field :expires_at, class: 'form-control js-access-expiration-date', placeholder: 'Select access expiration date', id: "member_expires_at_#{member.id}" + %i.clear-icon.js-clear-input .prepend-top-10 = f.submit 'Save', class: 'btn btn-save btn-sm' |