diff --git a/app/views/external_users/show.html.slim b/app/views/external_users/show.html.slim index 704f24f1..f9ed372a 100644 --- a/app/views/external_users/show.html.slim +++ b/app/views/external_users/show.html.slim @@ -5,7 +5,7 @@ h1 = @user.displayname = row(label: 'external_user.external_id') do code = @user.external_id -= row(label: 'external_user.consumer', value: link_to_if(policy(@user.consumer).show?, @user.consumer, @user.consumer)) += row(label: 'external_user.consumer', value: link_to_if(user.consumer.present? && policy(@user.consumer).show?, @user.consumer, @user.consumer)) = row(label: 'external_user.platform_admin', value: @user.platform_admin?) if current_user.admin? = row(label: 'users.show.study_groups') do - visible_memberships = @user.study_group_memberships.select { |study_group_membership| policy(study_group_membership.study_group).show? } diff --git a/app/views/internal_users/index.html.slim b/app/views/internal_users/index.html.slim index 9083a596..9e7e6c39 100644 --- a/app/views/internal_users/index.html.slim +++ b/app/views/internal_users/index.html.slim @@ -23,7 +23,7 @@ h1 = InternalUser.model_name.human(count: 2) - @users.each do |user| tr td = link_to_if(policy(user).show?, user.name, user) - td = user.consumer ? link_to_if(policy(user.consumer).show?, user.consumer, user.consumer) : empty + td = user.consumer ? link_to_if(user.consumer.present? && policy(user.consumer).show?, user.consumer, user.consumer) : empty - if current_user.admin? td = symbol_for(user.platform_admin?) td = link_to(t('shared.show'), user) if policy(user).show? diff --git a/app/views/internal_users/show.html.slim b/app/views/internal_users/show.html.slim index 91efdf7c..2a234842 100644 --- a/app/views/internal_users/show.html.slim +++ b/app/views/internal_users/show.html.slim @@ -4,7 +4,7 @@ h1 = row(label: 'internal_user.email', value: @user.email) if current_user.admin? = row(label: 'internal_user.name', value: @user.name) -= row(label: 'internal_user.consumer', value: @user.consumer ? link_to_if(policy(@user.consumer).show?, @user.consumer, @user.consumer) : nil) += row(label: 'internal_user.consumer', value: @user.consumer ? link_to_if(user.consumer.present? && policy(@user.consumer).show?, @user.consumer, @user.consumer) : nil) = row(label: 'internal_user.platform_admin', value: @user.platform_admin?) if current_user.admin? = row(label: 'internal_user.activated', value: @user.activated?) = row(label: 'users.show.study_groups') do