diff --git a/apimanager/consumers/templates/consumers/detail.html b/apimanager/consumers/templates/consumers/detail.html index 1f43820..30f7b18 100644 --- a/apimanager/consumers/templates/consumers/detail.html +++ b/apimanager/consumers/templates/consumers/detail.html @@ -9,17 +9,17 @@
ID
- {{ consumer.id }} + {{ consumer.consumer_id }}
-
+
App Type
{{ consumer.appType }}
-
+
Developer Email
- {{ consumer.developerEmail }} + {{ consumer.developer_email }}
@@ -34,9 +34,9 @@
{% 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 %}
{% csrf_token %} diff --git a/apimanager/consumers/templates/consumers/includes/filter_apptype.html b/apimanager/consumers/templates/consumers/includes/filter_apptype.html index baf39d1..cd9adc1 100644 --- a/apimanager/consumers/templates/consumers/includes/filter_apptype.html +++ b/apimanager/consumers/templates/consumers/includes/filter_apptype.html @@ -1,3 +1,3 @@ -Web -Mobile -All +Web +Mobile +All diff --git a/apimanager/consumers/templates/consumers/includes/filter_enabled.html b/apimanager/consumers/templates/consumers/includes/filter_enabled.html index 2aaa7fc..c00f4fe 100644 --- a/apimanager/consumers/templates/consumers/includes/filter_enabled.html +++ b/apimanager/consumers/templates/consumers/includes/filter_enabled.html @@ -1,3 +1,3 @@ -Enabled -Disabled -All +Enabled +Disabled +All diff --git a/apimanager/consumers/templates/consumers/includes/filter_time.html b/apimanager/consumers/templates/consumers/includes/filter_time.html index 6f25d5f..a114482 100644 --- a/apimanager/consumers/templates/consumers/includes/filter_time.html +++ b/apimanager/consumers/templates/consumers/includes/filter_time.html @@ -1,7 +1,7 @@ -Last Minute -Last Hour -Last Day -Last Week -Last Month -Last Year -All +Last Minute +Last Hour +Last Day +Last Week +Last Month +Last Year +All diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html index 666b00d..d6e2d83 100644 --- a/apimanager/consumers/templates/consumers/index.html +++ b/apimanager/consumers/templates/consumers/index.html @@ -37,29 +37,33 @@

Statistics

  • Total number of consumers: {{ statistics.consumers_num }}
  • -
  • Total number of unique developer email addresses: {{ statistics.unique_developerEmail_num }}
  • +
  • Total number of unique developer email addresses: {{ statistics.unique_developer_email_num }}
  • Total number of unique consumer names: {{ statistics.unique_name_num }}
- + + + {% for consumer in consumers %} - - {% url 'consumers-detail' consumer.id as url_detail %} - - - + + {% url 'consumers-detail' consumer.consumer_id as url_detail %} + + + + +
IdID Name Developer EmailRedirect URLCreated User ID Created Action
{{ consumer.id }}{{ consumer.name }}{{ consumer.developerEmail }}
{{ consumer.consumer_id }}{{ consumer.app_name }}{{ consumer.developer_email }}{{ consumer.redirect_url }}{{ consumer.created_by_user_id }} {{ consumer.created|naturaltime }} - + {% csrf_token %} {% if consumer.enabled %}{% else %}{% endif %} View diff --git a/apimanager/consumers/views.py b/apimanager/consumers/views.py index cbd5e7d..8dd910c 100644 --- a/apimanager/consumers/views.py +++ b/apimanager/consumers/views.py @@ -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