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

#1 Fixed name clash re apiuser vs Django user in detail template

Browse Source
This commit is contained in:
Sebastian Henschel 2016-11-19 13:15:13 +01:00
parent 77619d616c
commit 08dd7f715c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apimanager/users/templates/users/detail.html
View File

@ -1,28 +1,28 @@
{% extends 'base.html' %}
{% load static %}
{% block page_title %}{{ block.super }} / {{ user.username }}{% endblock page_title %}
{% block page_title %}{{ block.super }} / {{ apiuser.username }}{% endblock page_title %}
{% block content %}
<div id="users-detail">
<h1>User {{ user.username }}</h1>
<h1>User {{ apiuser.username }}</h1>
<div id="users-detail-user_id">
<strong>User ID</strong><br />
<span>{{ user.user_id }}</span>
<span>{{ apiuser.user_id }}</span>
</div>
<div id="users-detail-email">
<strong>Email</strong><br />
<span>{{ user.email }}</span>
<span>{{ apiuser.email }}</span>
</div>
{% if user.user_id %}
{% if apiuser.user_id %}
<div id="users-detail-entitlements">
<h2>Add Entitlement</h2>
<form class="form-inline" action="{% url 'users-add-entitlement' user.user_id %}" method="post">
<form class="form-inline" action="{% url 'users-add-entitlement' apiuser.user_id %}" method="post">
{% csrf_token %}
<input type="hidden" name="user_email" value="{{ user.email }}" />
<input type="hidden" name="user_email" value="{{ apiuser.email }}" />
<div class="form-group">
<label for="users-detail-entitlement-role_name">Role name</label> <input type="text" class="form-control" name="role_name" id="users-detail-entitlements-role_name" aria-label="active" />
</div>
@ -37,15 +37,15 @@
<h2>Entitlements</h2>
<table class="table table-striped">
<tbody>
{% for entitlement in user.entitlements %}
{% for entitlement in apiuser.entitlements %}
<tr>
<td>{{ entitlement.role_name }}</td>
<td>
{# SuperAdmin has no entitlement_id! #}
{% if entitlement.entitlement_id %}
<form action="{% url 'users-delete-entitlement' user.user_id entitlement.entitlement_id %}" method="post">
<form action="{% url 'users-delete-entitlement' apiuser.user_id entitlement.entitlement_id %}" method="post">
{% csrf_token %}
<input type="hidden" name="user_email" value="{{ user.email }}" />
<input type="hidden" name="user_email" value="{{ apiuser.email }}" />
<input type="hidden" name="role_name" value="{{ entitlement.role_name }}" />
<button type="submit" class="btn btn-primary btn-red">Delete</button>
</form>

2
apimanager/users/views.py
View File

@ -80,7 +80,7 @@ class DetailView(LoginRequiredMixin, TemplateView):
else:
user['entitlements'] = entitlements['list']
context.update({
'user': user,
'apiuser': user,
})
return context