From d17acdae905509a5f7c2f83d932ec5fb2e899649 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 30 Oct 2015 11:32:10 +0100 Subject: [PATCH] Hide results-container instead of table and remove plain text --- app/assets/javascripts/global_roles/principal_roles.js | 4 ++-- app/views/users/_global_roles.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/global_roles/principal_roles.js b/app/assets/javascripts/global_roles/principal_roles.js index 21f4b238a8..830c80ab73 100644 --- a/app/assets/javascripts/global_roles/principal_roles.js +++ b/app/assets/javascripts/global_roles/principal_roles.js @@ -25,12 +25,12 @@ set_table_visibility: function(){ if ($('#table_principal_roles_body tr').length > 0){ - $('#table_principal_roles').show(); + $('.generic-table--results-container').show(); $('.generic-table--no-results-container').hide(); } else { - $('#table_principal_roles').hide(); + $('.generic-table--results-container').hide(); $('.generic-table--no-results-container').show(); } }, diff --git a/app/views/users/_global_roles.html.erb b/app/views/users/_global_roles.html.erb index 43a3ee21a9..ca42804b48 100644 --- a/app/views/users/_global_roles.html.erb +++ b/app/views/users/_global_roles.html.erb @@ -58,7 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= l(:label_nothing_display) %>
-

Either nothing have been created or everything is filtered out.

+

<%= l(:label_no_data) %>