diff --git a/ee/app/views/ldap_group_links/_ldap_group_link.html.haml b/ee/app/views/ldap_group_links/_ldap_group_link.html.haml index fa0088010791f1688b40f7b2dccbdc1c960567dd..e2c419f1f4e9c5362c9c082c164b66bf3998a483 100644 --- a/ee/app/views/ldap_group_links/_ldap_group_link.html.haml +++ b/ee/app/views/ldap_group_links/_ldap_group_link.html.haml @@ -1,7 +1,7 @@ %li{ class: 'gl-items-center !gl-flex' } %div %p.gl-font-bold.gl-mb-0 - = ldap_group_link.cn ? _("Group: %{group_name}") % { group_name: ldap_group_link.cn } : _("Filter: %{filter_name})") % {filter_name: ldap_group_link.filter} + = ldap_group_link.cn ? _("Group: %{group_name}") % { group_name: ldap_group_link.cn } : _("Filter: %{filter_name}") % {filter_name: ldap_group_link.filter} - if ldap_group_link.config .light @@ -14,5 +14,6 @@ - unless ldap_group_link.active? = s_('LDAP|(Inactive because syncing with an LDAP user filter is not included in the current license)') - = link_button_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, variant: :danger, size: :small, icon: 'unlink', class: 'gl-ml-auto' do - = _('Remove') + - if show_remove + = link_button_to group_ldap_group_link_path(group, ldap_group_link), method: :delete, variant: :danger, size: :small, icon: 'unlink', class: 'gl-ml-auto' do + = _('Remove') diff --git a/ee/app/views/ldap_group_links/_ldap_group_links.html.haml b/ee/app/views/ldap_group_links/_ldap_group_links.html.haml index e628aba852863f8f9bac3907d826d5bd11f237cb..1d875423287a9983bcff4e5f8a3109325fc26d05 100644 --- a/ee/app/views/ldap_group_links/_ldap_group_links.html.haml +++ b/ee/app/views/ldap_group_links/_ldap_group_links.html.haml @@ -5,7 +5,7 @@ - c.with_body do - if group.ldap_group_links.any? %ul.content-list - = render partial: 'ldap_group_links/ldap_group_link', collection: group.ldap_group_links, locals: { group: group } + = render partial: 'ldap_group_links/ldap_group_link', collection: group.ldap_group_links, locals: { group: group, show_remove: true } - else %p.gl-my-4 = s_('LDAP|No LDAP synchronizations') diff --git a/ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml b/ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml index 20edd697fe514cdb47e4668d416c6a437be24a82..b9e08d4ac81297494b65a87d1a9f87850c6537dd 100644 --- a/ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml +++ b/ee/app/views/ldap_group_links/_ldap_group_links_show.html.haml @@ -4,8 +4,4 @@ = render ::Layouts::CrudComponent.new(s_('LDAP|Active synchronizations')) do |c| - c.with_body do %ul.content-list - - group.ldap_group_links.select(&:active?).each do |ldap_group_link| - %li - %strong= ldap_group_link.cn ? _("Group: %{group_name}") % { group_name: ldap_group_link.cn } : _("Filter: %{filter_name})") % {filter_name: truncate(ldap_group_link.filter, length: 40)} - _('as') - %strong= group_link_role_name(ldap_group_link) + = render partial: 'ldap_group_links/ldap_group_link', collection: group.ldap_group_links, locals: { group: group, show_remove: false } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7445db8889d2ef86e054509e38d1bcbea673547b..ec3156b4bd230d6d3c845aeb8874dc6279280005 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -23566,7 +23566,7 @@ msgstr "" msgid "Filter users" msgstr "" -msgid "Filter: %{filter_name})" +msgid "Filter: %{filter_name}" msgstr "" msgid "Finalizing"