diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-03 18:52:05 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-03 18:52:05 +0300 |
| commit | 686b630e75c292b6af1030349a1cff87af23224d (patch) | |
| tree | b6a53285bb3273d6f534e9df2ccd0b6c231f7df0 /app/views/shared/_group_form.html.haml | |
| parent | e28b3f0969b7d193522d6c7281fa61bf880ff58f (diff) | |
| parent | 2faf955c241ce7e99111f8fd0cae2e7ab6167e5a (diff) | |
Merge branch 'master' into 20827-getting-started-update-new-group-view
Diffstat (limited to 'app/views/shared/_group_form.html.haml')
| -rw-r--r-- | app/views/shared/_group_form.html.haml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index 0fb63a81cb1..89e176bb909 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -1,18 +1,28 @@ +- parent = GroupFinder.new(current_user).execute(id: params[:parent_id] || @group.parent_id) +- group_path = root_url +- group_path << parent.full_path + '/' if parent - if @group.persisted? .form-group.col-xs-12 = f.label :name, class: 'label-light' do %span Group name = f.text_field :name, placeholder: 'open-source', class: 'form-control' +<<<<<<< HEAD .form-group.col-xs-12 = f.label :path, class: 'label-light' do %span Group path .input-group.gl-field-error-anchor - .input-group-addon - = root_url + .group-root-path.input-group-addon.has-tooltip{ title: group_path, :'data-placement' => 'bottom' } + %span>= root_url + - if parent + %strong= parent.full_path + '/' = f.text_field :path, placeholder: 'open-source', class: 'form-control', - autofocus: local_assigns[:autofocus] || false, pattern: "[a-zA-Z0-9-_]+", - required: true, title: 'Please choose a group name with no special characters.' + autofocus: local_assigns[:autofocus] || false, required: true, + pattern: Gitlab::Regex::NAMESPACE_REGEX_STR_JS, + title: 'Please choose a group name with no special characters.', + "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}" + - if parent + = f.hidden_field :parent_id, value: parent.id - if @group.persisted? .alert.alert-warning.prepend-top-10 |