Merge branch 'master' into outpost-ldap

This commit is contained in:
Jens Langhammer 2021-04-26 17:11:50 +02:00
commit fae4d34131
3 changed files with 6 additions and 1 deletions

View file

@ -3,6 +3,10 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% block head_before %}
<link rel="stylesheet" type="text/css" href="{% static 'dist/patternfly.min.css' %}?v={{ ak_version }}">
{% endblock %}
{% block body %} {% block body %}
<div class="pf-c-background-image"> <div class="pf-c-background-image">
<svg xmlns="http://www.w3.org/2000/svg" class="pf-c-background-image__filter" width="0" height="0"> <svg xmlns="http://www.w3.org/2000/svg" class="pf-c-background-image__filter" width="0" height="0">

View file

@ -291,7 +291,7 @@ class OAuthFulfillmentStage(StageView):
GrantTypes.HYBRID, GrantTypes.HYBRID,
]: ]:
code = self.params.create_code(self.request) code = self.params.create_code(self.request)
code.save() code.save(force_insert=True)
if self.params.grant_type == GrantTypes.AUTHORIZATION_CODE: if self.params.grant_type == GrantTypes.AUTHORIZATION_CODE:
query_params["code"] = code.code query_params["code"] = code.code

View file

@ -15,6 +15,7 @@ const extensions = [
const resources = [ const resources = [
{ src: "node_modules/rapidoc/dist/rapidoc-min.js", dest: "dist/" }, { src: "node_modules/rapidoc/dist/rapidoc-min.js", dest: "dist/" },
{ src: "node_modules/@patternfly/patternfly/patternfly.min.css", dest: "dist/" },
{ src: "node_modules/@patternfly/patternfly/patternfly-base.css", dest: "dist/" }, { src: "node_modules/@patternfly/patternfly/patternfly-base.css", dest: "dist/" },
{ src: "node_modules/@patternfly/patternfly/components/Page/page.css", dest: "dist/" }, { src: "node_modules/@patternfly/patternfly/components/Page/page.css", dest: "dist/" },
{ src: "node_modules/@patternfly/patternfly/components/EmptyState/empty-state.css", dest: "dist/" }, { src: "node_modules/@patternfly/patternfly/components/EmptyState/empty-state.css", dest: "dist/" },