artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 14:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

buffix, fix: Users->All page, show all missing role message.

Browse Source
This commit is contained in:
shuang 2019-10-11 15:38:21 +08:00
parent 4387995144
commit 347e4b7637
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apimanager/users/templates/users/index.html
View File

@ -10,9 +10,7 @@
<div id="users-filters">
<h4>Filters</h4>
<div class="hidden-xs">
{% 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" %}
</div>

11
apimanager/users/views.py
View File

@ -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: