diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-01 15:31:56 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-01 15:39:59 +0200 |
| commit | b7c30cae4eedab5e8e41d9764ac08ca12361d054 (patch) | |
| tree | e5a594dfd920a55a52a00b34e632dfb553de4c45 /app/views/dashboard | |
| parent | 11dd2348c410949c98adfc10cdcf5be787742179 (diff) | |
| download | gitlab-ce-b7c30cae4eedab5e8e41d9764ac08ca12361d054.tar.gz | |
Add filter and sorting to dashboard groups page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/_groups_head.html.haml | 7 | ||||
| -rw-r--r-- | app/views/dashboard/groups/_groups.html.haml | 7 | ||||
| -rw-r--r-- | app/views/dashboard/groups/index.html.haml | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 23c145ebbb4..d49913f39c5 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -6,7 +6,10 @@ = nav_link(page: explore_groups_path) do = link_to explore_groups_path, title: 'Explore groups' do Explore Groups - - if current_user.can_create_group? - .nav-controls + .nav-controls + = form_tag request.path, method: :get, class: 'group-filter-form', id: 'group-filter-form' do |f| + = search_field_tag :filter_groups, params[:filter_groups], placeholder: 'Filter by name...', class: 'group-filter-form-field form-control input-short groups-list-filter', spellcheck: false, id: 'group-filter-form-field', tabindex: "2" + = render 'shared/groups/dropdown' + - if current_user.can_create_group? = link_to new_group_path, class: "btn btn-new" do New Group diff --git a/app/views/dashboard/groups/_groups.html.haml b/app/views/dashboard/groups/_groups.html.haml new file mode 100644 index 00000000000..750559d3d24 --- /dev/null +++ b/app/views/dashboard/groups/_groups.html.haml @@ -0,0 +1,7 @@ +.groups-list-holder + %ul.content-list + - @group_members.each do |group_member| + - group = group_member.group + = render 'shared/groups/group', group: group, group_member: group_member + + = paginate @group_members, theme: 'gitlab' diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml index 1a679c51774..75af02b9edf 100644 --- a/app/views/dashboard/groups/index.html.haml +++ b/app/views/dashboard/groups/index.html.haml @@ -5,9 +5,7 @@ - if @group_members.empty? = render 'empty_state' - else - %ul.content-list - - @group_members.each do |group_member| - - group = group_member.group - = render 'shared/groups/group', group: group, group_member: group_member + = render 'groups' - = paginate @group_members, theme: 'gitlab' +:javascript + GroupsList.init(); |