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

Closes #53

Browse Source
This commit is contained in:
kevgliss
2015-08-29 13:07:30 -07:00
parent bf8ce354e5
commit aca69ce03c
3 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lemur/certificates/service.py
View File

@ -91,19 +91,22 @@ def update(cert_id, owner, description, active, destinations, notifications):
cert.description = description
# we might have to create new notifications if the owner changes
if owner != cert.owner:
for n in cert.notifications:
notification_name = "DEFAULT_{0}".format(cert.owner.split('@')[0].upper())
if n.name == notification_name:
cert.notifications.remove(n)
new_notifications = []
# get existing names to remove
notification_name = "DEFAULT_{0}".format(cert.owner.split('@')[0].upper())
for n in notifications:
if notification_name not in n.label:
new_notifications.append(n)
cert.owner = owner
notification_name = "DEFAULT_{0}".format(cert.owner.split('@')[0].upper())
notifications = notification_service.create_default_expiration_notifications(notification_name, owner)
notification_name = "DEFAULT_{0}".format(owner.split('@')[0].upper())
new_notifications += notification_service.create_default_expiration_notifications(notification_name, owner)
cert.notifications = new_notifications
database.update_list(cert, 'notifications', Notification, notifications)
database.update_list(cert, 'destinations', Destination, destinations)
cert.owner = owner
return database.update(cert)

4
lemur/certificates/views.py
View File

@ -24,6 +24,8 @@ from lemur.roles import service as role_service
from lemur.common.utils import marshal_items, paginated_parser
from lemur.notifications.views import notification_list
mod = Blueprint('certificates', __name__)
api = Api(mod)
@ -569,7 +571,7 @@ class Certificates(AuthenticatedResource):
self.reqparse.add_argument('owner', type=str, location='json')
self.reqparse.add_argument('description', type=str, location='json')
self.reqparse.add_argument('destinations', type=list, default=[], location='json')
self.reqparse.add_argument('notifications', type=list, default=[], location='json')
self.reqparse.add_argument('notifications', type=notification_list, default=[], location='json')
args = self.reqparse.parse_args()
cert = service.get(certificate_id)