diff --git a/apimanager/users/templates/users/index.html b/apimanager/users/templates/users/index.html
index 8313e2d..5e304c6 100644
--- a/apimanager/users/templates/users/index.html
+++ b/apimanager/users/templates/users/index.html
@@ -10,9 +10,7 @@
Filters
- {% if role_names %}
- {% include "users/includes/filter_role.html" %}
- {% endif %}
+ {% include "users/includes/filter_role.html" %}
{% include "users/includes/filter_email.html" %}
{% include "users/includes/filter_username.html" %}
diff --git a/apimanager/users/views.py b/apimanager/users/views.py
index 24e1dbe..5ef9031 100644
--- a/apimanager/users/views.py
+++ b/apimanager/users/views.py
@@ -56,8 +56,9 @@ class IndexView(LoginRequiredMixin, TemplateView):
try:
urlpath = '/entitlements'
entitlements = api.get(urlpath)
- if 'code' in entitlements and entitlements['code']>=400:
- messages.error(self.request, entitlements['message'])
+ if 'code' in entitlements and entitlements['code'] >= 400:
+ messages.error(self.request, entitlements['message'] +
+ " No Role name will be shown in the 'Filters' dropdown!")
else:
for entitlement in entitlements['list']:
role_names.append(entitlement['role_name'])
@@ -92,7 +93,11 @@ class IndexView(LoginRequiredMixin, TemplateView):
users = []
try:
- users = api.get(urlpath)
+ response = api.get(urlpath)
+ if 'code' in response and response['code'] >= 400:
+ messages.error(self.request, response['message'] + "! No user will be shown!")
+ else:
+ users = response
except APIError as err:
messages.error(self.request, err)
except: