diff options
Diffstat (limited to 'app/views/admin/groups')
| -rw-r--r-- | app/views/admin/groups/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/groups/index.html.haml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 0c3ce1f3fa4..8ac6f63cdfb 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -18,7 +18,7 @@ .form-group.row .offset-sm-2.col-sm-10 - = render 'shared/allow_request_access', form: f, bold_label: true + = render 'shared/allow_request_access', form: f = render 'groups/group_admin_settings', f: f @@ -27,7 +27,7 @@ - if @group.new_record? .form-group.row .offset-sm-2.col-sm-10 - = render 'shared/global_alert', dismissible: false do + = render Pajamas::AlertComponent.new(dismissible: false) do .gl-alert-body = render 'shared/group_tips' .form-actions diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index 17dccae44b5..2ea5890be2c 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -5,9 +5,8 @@ = form_tag admin_groups_path, method: :get, class: 'js-search-form' do |f| = hidden_field_tag :sort, @sort .search-holder - - project_name = params[:name].present? ? params[:name] : nil .search-field-holder - = search_field_tag :name, project_name, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { qa_selector: 'group_search_field' } + = search_field_tag :name, params[:name].presence, class: "form-control search-text-input js-search-input", autofocus: true, spellcheck: false, placeholder: 'Search by name', data: { qa_selector: 'group_search_field' } = sprite_icon('search', css_class: 'search-icon') = render "shared/groups/dropdown", options_hash: admin_groups_sort_options_hash = link_to new_admin_group_path, class: "gl-button btn btn-confirm" do |