Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensuring that default-issuer is set (#553)

This commit is contained in:
kevgliss 2016-12-02 09:54:16 -08:00 committed by GitHub
parent e0c79389ca
commit 0f5e925a1a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/defaults/schemas.py
View File

@ -11,13 +11,13 @@ from lemur.authorities.schemas import AuthorityNestedOutputSchema
class DefaultOutputSchema(LemurOutputSchema): class DefaultOutputSchema(LemurOutputSchema):
__envelope__ = False
authority = fields.Nested(AuthorityNestedOutputSchema) authority = fields.Nested(AuthorityNestedOutputSchema)
country = fields.String() country = fields.String()
state = fields.String() state = fields.String()
location = fields.String() location = fields.String()
organization = fields.String() organization = fields.String()
organizationalUnit = fields.String() organizational_unit = fields.String()
issuer_plugin = fields.String()
default_output_schema = DefaultOutputSchema() default_output_schema = DefaultOutputSchema()

4
lemur/defaults/views.py
View File

@ -65,8 +65,8 @@ class LemurDefaults(AuthenticatedResource):
state=current_app.config.get('LEMUR_DEFAULT_STATE'), state=current_app.config.get('LEMUR_DEFAULT_STATE'),
location=current_app.config.get('LEMUR_DEFAULT_LOCATION'), location=current_app.config.get('LEMUR_DEFAULT_LOCATION'),
organization=current_app.config.get('LEMUR_DEFAULT_ORGANIZATION'), organization=current_app.config.get('LEMUR_DEFAULT_ORGANIZATION'),
organizationalUnit=current_app.config.get('LEMUR_DEFAULT_ORGANIZATIONAL_UNIT'), organizational_unit=current_app.config.get('LEMUR_DEFAULT_ORGANIZATIONAL_UNIT'),
issuerPlugin=current_app.config.get('LEMUR_DEFAULT_ISSUER_PLUGIN'), issuer_plugin=current_app.config.get('LEMUR_DEFAULT_ISSUER_PLUGIN'),
authority=default_authority authority=default_authority
) )