Merge branch 'master' into letsencrypt_account_support

This commit is contained in:
Curtis
2018-07-30 15:28:29 -07:00
committed by GitHub
3 changed files with 10 additions and 10 deletions

View File

@ -5,7 +5,7 @@
.. moduleauthor:: James Chuong <jchuong@instartlogic.com>
"""
from flask import Blueprint, g, make_response, jsonify
from flask_restful import Api, reqparse
from flask_restful import Api, reqparse, inputs
from lemur.auth.service import AuthenticatedResource
from lemur.auth.permissions import CertificatePermission
@ -110,9 +110,9 @@ class PendingCertificatesList(AuthenticatedResource):
"""
parser = paginated_parser.copy()
parser.add_argument('timeRange', type=int, dest='time_range', location='args')
parser.add_argument('owner', type=bool, location='args')
parser.add_argument('owner', type=inputs.boolean, location='args')
parser.add_argument('id', type=str, location='args')
parser.add_argument('active', type=bool, location='args')
parser.add_argument('active', type=inputs.boolean, location='args')
parser.add_argument('destinationId', type=int, dest="destination_id", location='args')
parser.add_argument('creator', type=str, location='args')
parser.add_argument('show', type=str, location='args')