From 1525160b4b48ace66d690f0dc15fb98b01e17449 Mon Sep 17 00:00:00 2001 From: Hongwei Date: Thu, 25 Nov 2021 15:02:01 +0100 Subject: [PATCH 1/2] bugfix/added Add a 'scope' attribute to this tag. --- .../templates/apicollections/detail.html | 2 +- apimanager/base/static/css/base.css | 1 - apimanager/branches/templates/branches/index.html | 10 +++++----- apimanager/consumers/templates/consumers/index.html | 10 +++++----- .../templates/entitlementrequests/index.html | 12 ++++++------ apimanager/metrics/templates/metrics/api.html | 12 ++++++------ apimanager/metrics/templates/metrics/connector.html | 12 ++++++------ apimanager/users/templates/users/detail.html | 6 +++--- apimanager/users/templates/users/index.html | 8 ++++---- apimanager/users/templates/users/invitation.html | 12 ++++++------ 10 files changed, 42 insertions(+), 43 deletions(-) diff --git a/apimanager/apicollections/templates/apicollections/detail.html b/apimanager/apicollections/templates/apicollections/detail.html index fe7bcd7..ddc541e 100644 --- a/apimanager/apicollections/templates/apicollections/detail.html +++ b/apimanager/apicollections/templates/apicollections/detail.html @@ -21,7 +21,7 @@
- + {% for api_collection_endpoint in api_collection_endpoints %} diff --git a/apimanager/base/static/css/base.css b/apimanager/base/static/css/base.css index c43b0ed..019a4ff 100644 --- a/apimanager/base/static/css/base.css +++ b/apimanager/base/static/css/base.css @@ -206,7 +206,6 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo text-align: center; line-height: 24px; border-radius: 0; - border: 0; padding: 9px 20px 11px; border: 1px solid #333333; } \ No newline at end of file diff --git a/apimanager/branches/templates/branches/index.html b/apimanager/branches/templates/branches/index.html index d2fb236..25a8fe8 100644 --- a/apimanager/branches/templates/branches/index.html +++ b/apimanager/branches/templates/branches/index.html @@ -157,11 +157,11 @@
Operation IdsOperation Ids
- - - - - + + + + + {% for branch in branches_list %} diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html index fdd5e11..821e9ab 100644 --- a/apimanager/consumers/templates/consumers/index.html +++ b/apimanager/consumers/templates/consumers/index.html @@ -52,11 +52,11 @@
Branch IdBank IdBranch NameMore_infoUpdate ButtonBranch IdBank IdBranch NameMore_infoUpdate Button
- - - - - + + + + + diff --git a/apimanager/entitlementrequests/templates/entitlementrequests/index.html b/apimanager/entitlementrequests/templates/entitlementrequests/index.html index 2688e4c..d006afd 100644 --- a/apimanager/entitlementrequests/templates/entitlementrequests/index.html +++ b/apimanager/entitlementrequests/templates/entitlementrequests/index.html @@ -24,12 +24,12 @@
IDNameDescriptionCreatedActionIDNameDescriptionCreatedAction
- - - - - - + + + + + + diff --git a/apimanager/metrics/templates/metrics/api.html b/apimanager/metrics/templates/metrics/api.html index 1fa4c3f..88c7aee 100644 --- a/apimanager/metrics/templates/metrics/api.html +++ b/apimanager/metrics/templates/metrics/api.html @@ -138,12 +138,12 @@
Role NameUser nameBank IDCreatedActionActionRole NameUser nameBank IDCreatedActionAction
- - - - - - + + + + + + diff --git a/apimanager/metrics/templates/metrics/connector.html b/apimanager/metrics/templates/metrics/connector.html index b804dda..ec1e663 100644 --- a/apimanager/metrics/templates/metrics/connector.html +++ b/apimanager/metrics/templates/metrics/connector.html @@ -81,12 +81,12 @@
#VerbURLDateDuration(ms)Details#VerbURLDateDuration(ms)Details
- - - - - - + + + + + + diff --git a/apimanager/users/templates/users/detail.html b/apimanager/users/templates/users/detail.html index b71a7f9..08c08f4 100644 --- a/apimanager/users/templates/users/detail.html +++ b/apimanager/users/templates/users/detail.html @@ -90,9 +90,9 @@
#DateConnector NameFunction NameCorrelation IDDuration (ms)#DateConnector NameFunction NameCorrelation IDDuration (ms)
- - - + + + {% for entitlement in apiuser.entitlements.list %} diff --git a/apimanager/users/templates/users/index.html b/apimanager/users/templates/users/index.html index d9f2c56..f503e9d 100644 --- a/apimanager/users/templates/users/index.html +++ b/apimanager/users/templates/users/index.html @@ -54,10 +54,10 @@
Role nameBank IdActionRole nameBank IdAction
- - - - + + + + {% for user in users %} diff --git a/apimanager/users/templates/users/invitation.html b/apimanager/users/templates/users/invitation.html index 3a73051..7552647 100644 --- a/apimanager/users/templates/users/invitation.html +++ b/apimanager/users/templates/users/invitation.html @@ -67,12 +67,12 @@
User IdUsernameEmailActionUser IdUsernameEmailAction
- - - - - - + + + + + + {% for invitation in invitations %} From d90f247e938fdc55b051cadf3048c64d7c01f57f Mon Sep 17 00:00:00 2001 From: Hongwei Date: Fri, 26 Nov 2021 14:23:24 +0100 Subject: [PATCH 2/2] bugfix/fixed the bugs for sonarcloud --- .../templates/apicollections/detail.html | 2 +- apimanager/branches/templates/branches/index.html | 2 +- apimanager/consumers/templates/consumers/index.html | 2 +- apimanager/consumers/views.py | 12 ++++++------ .../templates/entitlementrequests/index.html | 2 +- apimanager/metrics/templates/metrics/api.html | 2 +- apimanager/metrics/templates/metrics/connector.html | 2 +- .../metrics/templates/metrics/custom_summary.html | 4 ++++ .../metrics/templates/metrics/daily_summary.html | 4 ++++ .../metrics/templates/metrics/hourly_summary.html | 4 ++++ .../metrics/templates/metrics/monthly_summary.html | 4 ++++ .../metrics/templates/metrics/quarterly_summary.html | 4 ++++ .../metrics/templates/metrics/weekly_summary.html | 4 ++++ .../metrics/templates/metrics/yearly_summary.html | 4 ++++ apimanager/users/templates/users/detail.html | 2 +- apimanager/users/templates/users/index.html | 2 +- apimanager/users/templates/users/invitation.html | 2 +- 17 files changed, 43 insertions(+), 15 deletions(-) diff --git a/apimanager/apicollections/templates/apicollections/detail.html b/apimanager/apicollections/templates/apicollections/detail.html index ddc541e..12c5de9 100644 --- a/apimanager/apicollections/templates/apicollections/detail.html +++ b/apimanager/apicollections/templates/apicollections/detail.html @@ -19,7 +19,7 @@

Endpoints

-
First NameLast NameEmailcompanycountrystatusFirst NameLast NameEmailcompanycountrystatus
+
diff --git a/apimanager/branches/templates/branches/index.html b/apimanager/branches/templates/branches/index.html index 25a8fe8..a00c239 100644 --- a/apimanager/branches/templates/branches/index.html +++ b/apimanager/branches/templates/branches/index.html @@ -155,7 +155,7 @@
-
Operation Ids
+
diff --git a/apimanager/consumers/templates/consumers/index.html b/apimanager/consumers/templates/consumers/index.html index 821e9ab..bcaad52 100644 --- a/apimanager/consumers/templates/consumers/index.html +++ b/apimanager/consumers/templates/consumers/index.html @@ -50,7 +50,7 @@
-
Branch Id Bank Id
+
diff --git a/apimanager/consumers/views.py b/apimanager/consumers/views.py index 4a81c32..5ca2f48 100644 --- a/apimanager/consumers/views.py +++ b/apimanager/consumers/views.py @@ -116,9 +116,9 @@ class DetailView(LoginRequiredMixin, FormView): """Put limits data to API""" try: data = '' - form = ApiConsumersForm(self.request.POST) - if form.is_valid(): - data = form.cleaned_data + api_consumers_form = ApiConsumersForm(self.request.POST) + if api_consumers_form.is_valid(): + data = api_consumers_form.cleaned_data urlpath = '/management/consumers/{}/consumer/calls_limit'.format(data['consumer_id']) @@ -132,16 +132,16 @@ class DetailView(LoginRequiredMixin, FormView): user = self.api.put(urlpath, payload=payload) except APIError as err: messages.error(self.request, err) - return super(DetailView, self).form_invalid(form) + return super(DetailView, self).form_invalid(api_consumers_form) except Exception as err: messages.error(self.request, "{}".format(err)) - return super(DetailView, self).form_invalid(form) + return super(DetailView, self).form_invalid(api_consumers_form) msg = 'calls limit of consumer {} has been updated successfully.'.format( data['consumer_id']) messages.success(self.request, msg) self.success_url = self.request.path - return super(DetailView, self).form_valid(form) + return super(DetailView, self).form_valid(api_consumers_form) def get_context_data(self, **kwargs): context = super(DetailView, self).get_context_data(**kwargs) diff --git a/apimanager/entitlementrequests/templates/entitlementrequests/index.html b/apimanager/entitlementrequests/templates/entitlementrequests/index.html index d006afd..9671b95 100644 --- a/apimanager/entitlementrequests/templates/entitlementrequests/index.html +++ b/apimanager/entitlementrequests/templates/entitlementrequests/index.html @@ -22,7 +22,7 @@
-
ID Name
+
diff --git a/apimanager/metrics/templates/metrics/api.html b/apimanager/metrics/templates/metrics/api.html index 88c7aee..b273314 100644 --- a/apimanager/metrics/templates/metrics/api.html +++ b/apimanager/metrics/templates/metrics/api.html @@ -135,7 +135,7 @@ {% block tab_content %}
-
Role Name User name
+
diff --git a/apimanager/metrics/templates/metrics/connector.html b/apimanager/metrics/templates/metrics/connector.html index ec1e663..215d768 100644 --- a/apimanager/metrics/templates/metrics/connector.html +++ b/apimanager/metrics/templates/metrics/connector.html @@ -78,7 +78,7 @@
-
#
+
diff --git a/apimanager/metrics/templates/metrics/custom_summary.html b/apimanager/metrics/templates/metrics/custom_summary.html index 588fb92..757eac7 100644 --- a/apimanager/metrics/templates/metrics/custom_summary.html +++ b/apimanager/metrics/templates/metrics/custom_summary.html @@ -76,6 +76,10 @@

Period : From {{ from_date }} to {{ to_date }}

#
+ + + + diff --git a/apimanager/metrics/templates/metrics/daily_summary.html b/apimanager/metrics/templates/metrics/daily_summary.html index 43e39da..704af4e 100644 --- a/apimanager/metrics/templates/metrics/daily_summary.html +++ b/apimanager/metrics/templates/metrics/daily_summary.html @@ -69,6 +69,10 @@

Period : From {{ from_date }} to {{ to_date }}

Total API calls: {{ api_calls }}
+ + + + diff --git a/apimanager/metrics/templates/metrics/hourly_summary.html b/apimanager/metrics/templates/metrics/hourly_summary.html index 8263a0e..00aeb72 100644 --- a/apimanager/metrics/templates/metrics/hourly_summary.html +++ b/apimanager/metrics/templates/metrics/hourly_summary.html @@ -68,6 +68,10 @@

Period : From {{ from_date }} to {{ to_date }}

Total API calls: {{ api_calls }}
+ + + + diff --git a/apimanager/metrics/templates/metrics/monthly_summary.html b/apimanager/metrics/templates/metrics/monthly_summary.html index 320cafe..08d6079 100644 --- a/apimanager/metrics/templates/metrics/monthly_summary.html +++ b/apimanager/metrics/templates/metrics/monthly_summary.html @@ -79,6 +79,10 @@

Period : From {{ from_date }} to {{ to_date }}

API calls: {{ api_calls }}
+ + + + diff --git a/apimanager/metrics/templates/metrics/quarterly_summary.html b/apimanager/metrics/templates/metrics/quarterly_summary.html index 9d67aff..48d99e3 100644 --- a/apimanager/metrics/templates/metrics/quarterly_summary.html +++ b/apimanager/metrics/templates/metrics/quarterly_summary.html @@ -68,6 +68,10 @@

Period : From {{ from_date }} to {{ to_date }}

Total API calls: {{ api_calls }}
+ + + + diff --git a/apimanager/metrics/templates/metrics/weekly_summary.html b/apimanager/metrics/templates/metrics/weekly_summary.html index 6b92240..4abc0c7 100644 --- a/apimanager/metrics/templates/metrics/weekly_summary.html +++ b/apimanager/metrics/templates/metrics/weekly_summary.html @@ -70,6 +70,10 @@

Period : From {{ from_date }} to {{ to_date }}

Total API calls: {{ api_calls }}
+ + + + diff --git a/apimanager/metrics/templates/metrics/yearly_summary.html b/apimanager/metrics/templates/metrics/yearly_summary.html index 0810309..f6ce466 100644 --- a/apimanager/metrics/templates/metrics/yearly_summary.html +++ b/apimanager/metrics/templates/metrics/yearly_summary.html @@ -70,6 +70,10 @@

Period : From {{ from_date }} to {{ to_date }}

Total API calls: {{ api_calls }}
+ + + + diff --git a/apimanager/users/templates/users/detail.html b/apimanager/users/templates/users/detail.html index 08c08f4..61d85df 100644 --- a/apimanager/users/templates/users/detail.html +++ b/apimanager/users/templates/users/detail.html @@ -88,7 +88,7 @@

Entitlements

-
Total API calls: {{ api_calls }}
+
diff --git a/apimanager/users/templates/users/index.html b/apimanager/users/templates/users/index.html index f503e9d..9021ce0 100644 --- a/apimanager/users/templates/users/index.html +++ b/apimanager/users/templates/users/index.html @@ -52,7 +52,7 @@
-
Role name Bank Id
+
diff --git a/apimanager/users/templates/users/invitation.html b/apimanager/users/templates/users/invitation.html index 7552647..a979b64 100644 --- a/apimanager/users/templates/users/invitation.html +++ b/apimanager/users/templates/users/invitation.html @@ -65,7 +65,7 @@
-
User Id Username
+
First Name Last Name