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

consumers gives 500 error #8

Browse Source
This commit is contained in:
hongwei1 2017-01-27 12:02:58 +01:00
parent c4fc479620
commit f413a7365f
6 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apimanager/consumers/templates/consumers/detail.html
View File

@ -9,17 +9,17 @@
<div id="consumers-detail-id">
<strong>ID</strong><br />
<span>{{ consumer.id }}</span>
<span>{{ consumer.consumer_id }}</span>
</div>
<div id="consumers-detail-apptype">
<div id="consumers-detail-app-type">
<strong>App Type</strong><br />
<span>{{ consumer.appType }}</span>
</div>
<div id="consumers-detail-developerEmail">
<div id="consumers-detail-developer-email">
<strong>Developer Email</strong><br />
<span>{{ consumer.developerEmail }}</span>
<span>{{ consumer.developer_email }}</span>
</div>
<div id="consumers-detail-created">
@ -34,9 +34,9 @@
<div id="consumers-detail-enable">
{% if consumer.enabled %}
{% url 'consumers-disable' consumer.id as url_action %}
{% url 'consumers-disable' consumer.consumer_id as url_action %}
{% else %}
{% url 'consumers-enable' consumer.id as url_action %}
{% url 'consumers-enable' consumer.consumer_id as url_action %}
{% endif %}
<form action="{{ url_action }}" method="post">
{% csrf_token %}

6
apimanager/consumers/templates/consumers/includes/filter_apptype.html
View File

@ -1,3 +1,3 @@
<a href="?apptype=Web&time={{ request.GET.time }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_apptype_Web %} active{% endif %}">Web</a>
<a href="?apptype=Mobile&time={{ request.GET.time }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_apptype_Mobile %} active{% endif %}">Mobile</a>
<a href="?apptype=All&time={{ request.GET.time }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_apptype_all %} active{% endif %}">All</a>
<a href="?app_type=Web&time={{ request.GET.time }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_app_type_Web %} active{% endif %}">Web</a>
<a href="?app_type=Mobile&time={{ request.GET.time }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_app_type_Mobile %} active{% endif %}">Mobile</a>
<a href="?app_type=All&time={{ request.GET.time }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_app_type_all %} active{% endif %}">All</a>

6
apimanager/consumers/templates/consumers/includes/filter_enabled.html
View File

@ -1,3 +1,3 @@
<a href="?enabled=true&apptype={{ request.GET.apptype }}&time={{ request.GET.time }}" class="btn btn-default{% if active_enabled_true %} active{% endif %}">Enabled</a>
<a href="?enabled=false&apptype={{ request.GET.apptype }}&time={{ request.GET.time }}" class="btn btn-default{% if active_enabled_false %} active{% endif %}">Disabled</a>
<a href="?enabled=All&apptype={{ request.GET.apptype }}&time={{ request.GET.time }}" class="btn btn-default{% if active_enabled_all %} active{% endif %}">All</a>
<a href="?enabled=true&app_type={{ request.GET.app_type }}&time={{ request.GET.time }}" class="btn btn-default{% if active_enabled_true %} active{% endif %}">Enabled</a>
<a href="?enabled=false&app_type={{ request.GET.app_type }}&time={{ request.GET.time }}" class="btn btn-default{% if active_enabled_false %} active{% endif %}">Disabled</a>
<a href="?enabled=All&app_type={{ request.GET.app_type }}&time={{ request.GET.time }}" class="btn btn-default{% if active_enabled_all %} active{% endif %}">All</a>

14
apimanager/consumers/templates/consumers/includes/filter_time.html
View File

@ -1,7 +1,7 @@
<a href="?time=minute&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_minute %} active{% endif %}">Last Minute</a>
<a href="?time=hour&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_hour %} active{% endif %}">Last Hour</a>
<a href="?time=day&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_day %} active{% endif %}">Last Day</a>
<a href="?time=week&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_week %} active{% endif %}">Last Week</a>
<a href="?time=month&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_month %} active{% endif %}">Last Month</a>
<a href="?time=year&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_year %} active{% endif %}">Last Year</a>
<a href="?time=All&apptype={{ request.GET.apptype }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_all %} active{% endif %}">All</a>
<a href="?time=minute&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_minute %} active{% endif %}">Last Minute</a>
<a href="?time=hour&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_hour %} active{% endif %}">Last Hour</a>
<a href="?time=day&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_day %} active{% endif %}">Last Day</a>
<a href="?time=week&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_week %} active{% endif %}">Last Week</a>
<a href="?time=month&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_month %} active{% endif %}">Last Month</a>
<a href="?time=year&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_year %} active{% endif %}">Last Year</a>
<a href="?time=All&app_type={{ request.GET.app_type }}&enabled={{ request.GET.enabled }}" class="btn btn-default{% if active_time_all %} active{% endif %}">All</a>

20
apimanager/consumers/templates/consumers/index.html
View File

@ -37,29 +37,33 @@
<h2>Statistics</h2>
<ul id="statistics">
<li>Total number of consumers: {{ statistics.consumers_num }}</li>
<li>Total number of unique developer email addresses: {{ statistics.unique_developerEmail_num }}</li>
<li>Total number of unique developer email addresses: {{ statistics.unique_developer_email_num }}</li>
<li>Total number of unique consumer names: {{ statistics.unique_name_num }}</li>
</ul>
<div class="table-responsive">
<table class="table table-hover" id="consumer-list">
<thead>
<th>Id</th>
<th>ID</th>
<th>Name</th>
<th>Developer Email</th>
<th>Redirect URL</th>
<th>Created User ID</th>
<th>Created</th>
<th>Action</th>
</thead>
<tbody>
{% for consumer in consumers %}
<tr class="consumer-row {% if consumer.enabled %}consumer-enabled{% else %}consumer-disabled{% endif %}" data-consumer-id="{{ consumer.id }}">
{% url 'consumers-detail' consumer.id as url_detail %}
<td>{{ consumer.id }}</td>
<td class="select"><a href="{{ url_detail }}">{{ consumer.name }}</a></td>
<td class="select">{{ consumer.developerEmail }}</td>
<tr class="consumer-row {% if consumer.enabled %}consumer-enabled{% else %}consumer-disabled{% endif %}" data-consumer-id="{{ consumer.consumer_id }}">
{% url 'consumers-detail' consumer.consumer_id as url_detail %}
<td>{{ consumer.consumer_id }}</td>
<td class="select"><a href="{{ url_detail }}">{{ consumer.app_name }}</a></td>
<td class="select">{{ consumer.developer_email }}</td>
<td class="select">{{ consumer.redirect_url }}</td>
<td class="select">{{ consumer.created_by_user_id }}</td>
<td class="select">{{ consumer.created|naturaltime }}</td>
<td>
<form action="{% if consumer.enabled %}{% url 'consumers-disable' consumer.id %}{% else %}{% url 'consumers-enable' consumer.id %}{% endif %}?{{ request.GET.urlencode }}" method="post">
<form action="{% if consumer.enabled %}{% url 'consumers-disable' consumer.consumer_id %}{% else %}{% url 'consumers-enable' consumer.consumer_id %}{% endif %}?{{ request.GET.urlencode }}" method="post">
{% csrf_token %}
{% if consumer.enabled %}<button class="btn btn-primary btn-red">Disable</button>{% else %}<button class="btn btn-primary btn-green">Enable</button>{% endif %}
<a href="{{ url_detail }}" class="btn btn-primary" role="button">View</a>

8
apimanager/consumers/views.py
View File

@ -18,7 +18,7 @@ from base.filters import BaseFilter, FilterTime
class FilterAppType(BaseFilter):
"""Filter consumers by application type"""
filter_type = 'apptype'
filter_type = 'app_type'
def _apply(self, data, filter_value):
filtered = [x for x in data if x['appType'] == filter_value]
@ -53,13 +53,13 @@ class IndexView(LoginRequiredMixin, TemplateView):
unique_developer_email = {}
unique_name = {}
for consumer in consumers:
unique_developer_email[consumer['developerEmail']] = True
unique_name[consumer['name']] = True
unique_developer_email[consumer['developer_email']] = True
unique_name[consumer['app_name']] = True
unique_developer_email = unique_developer_email.keys()
unique_name = unique_name.keys()
statistics = {
'consumers_num': len(consumers),
'unique_developerEmail_num': len(unique_developer_email),
'unique_developer_email_num': len(unique_developer_email),
'unique_name_num': len(unique_name),
}
return statistics