From 368ed5ad274cc651d914cc425c08e8d4f8880a29 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 6 Apr 2015 22:41:47 +0200 Subject: [PATCH] Use new group members route. --- CHANGELOG-EE | 1 + app/controllers/groups/ldaps_controller.rb | 2 +- .../projects/project_members/_shared_group_members.html.haml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-EE b/CHANGELOG-EE index 7c49fb43d1..5168a6a200 100644 --- a/CHANGELOG-EE +++ b/CHANGELOG-EE @@ -1,6 +1,7 @@ v 7.10.0 (unreleased) - Improve UI for next pages: Group LDAP sync, Project git hooks, Project share with groups, Admin -> Appearance settigns - Default git hooks for new projects + - Fix LDAP group links page by using new group members route. v 7.9.0 (unreleased) - Strip prefixes and suffixes from synced SSH keys: diff --git a/app/controllers/groups/ldaps_controller.rb b/app/controllers/groups/ldaps_controller.rb index 2774e3fc4f..f2e4d82244 100644 --- a/app/controllers/groups/ldaps_controller.rb +++ b/app/controllers/groups/ldaps_controller.rb @@ -5,6 +5,6 @@ class Groups::LdapsController < Groups::ApplicationController def reset_access LdapGroupResetService.new.execute(group, current_user) - redirect_to members_group_path(@group), notice: 'Access reset complete' + redirect_to group_group_members_path(@group), notice: 'Access reset complete' end end diff --git a/app/views/projects/project_members/_shared_group_members.html.haml b/app/views/projects/project_members/_shared_group_members.html.haml index c2f4480e8c..5dd32cfcaf 100644 --- a/app/views/projects/project_members/_shared_group_members.html.haml +++ b/app/views/projects/project_members/_shared_group_members.html.haml @@ -18,4 +18,4 @@ = render 'groups/group_members/group_member', member: member, show_controls: false, show_roles: false - if shared_group_users_count > 20 %li - and #{shared_group_users_count - 20} more. For full list visit #{link_to 'group members page', members_group_path(shared_group)} + and #{shared_group_users_count - 20} more. For full list visit #{link_to 'group members page', group_group_members_path(shared_group)}