From 8d09d865b14bf0581c577bc524abdcbfb80a1e4d Mon Sep 17 00:00:00 2001
From: kevgliss
Date: Sat, 29 Aug 2015 11:48:39 -0700
Subject: [PATCH] Closes #57
---
lemur/certificates/service.py | 4 ++++
lemur/certificates/views.py | 4 +++-
.../app/angular/certificates/certificate/upload.tpl.html | 9 +++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/lemur/certificates/service.py b/lemur/certificates/service.py
index 6fb2f634..1416d372 100644
--- a/lemur/certificates/service.py
+++ b/lemur/certificates/service.py
@@ -179,6 +179,10 @@ def upload(**kwargs):
kwargs.get('intermediate_cert'),
)
+ # we override the generated name if one is provided
+ if kwargs.get('name'):
+ cert.name = kwargs['name']
+
cert.description = kwargs.get('description')
cert.owner = kwargs['owner']
diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py
index b6cb597d..4643dedc 100644
--- a/lemur/certificates/views.py
+++ b/lemur/certificates/views.py
@@ -332,7 +332,8 @@ class CertificatesUpload(AuthenticatedResource):
"intermediateCert": "---Begin Public...",
"privateKey": "---Begin Private..."
"destinations": [],
- "notifications": []
+ "notifications": [],
+ "name": "cert1"
}
**Example response**:
@@ -373,6 +374,7 @@ class CertificatesUpload(AuthenticatedResource):
"""
self.reqparse.add_argument('description', type=str, location='json')
self.reqparse.add_argument('owner', type=str, required=True, location='json')
+ self.reqparse.add_argument('name', type=str, location='json')
self.reqparse.add_argument('publicCert', type=pem_str, required=True, dest='public_cert', location='json')
self.reqparse.add_argument('destinations', type=list, default=[], dest='destinations', location='json')
self.reqparse.add_argument('notifications', type=list, default=[], dest='notifications', location='json')
diff --git a/lemur/static/app/angular/certificates/certificate/upload.tpl.html b/lemur/static/app/angular/certificates/certificate/upload.tpl.html
index 6ba63232..928e923e 100644
--- a/lemur/static/app/angular/certificates/certificate/upload.tpl.html
+++ b/lemur/static/app/angular/certificates/certificate/upload.tpl.html
@@ -18,6 +18,15 @@
email.
+