summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Barclay <alex@planet-barclay.com>2016-01-22 16:06:04 -0800
committerKiall Mac Innes <kiall@macinnes.ie>2016-01-28 20:36:39 +0000
commit6b412e8647beae0e6e9215ab640ec50ff750d665 (patch)
tree338a590ba880d708c1812c7269fde75aba4f551e
parent67175e7a1928b281e6e94516fcd77874166cbb14 (diff)
downloaddesignate-6b412e8647beae0e6e9215ab640ec50ff750d665.tar.gz
Fixes wording of exceptions for delete
Updated the wording of exceptions that prevent the deletion of managed records. Original message indicated that user was unable to update when the user actually requested a delete. New message is "Managed records may not be deleted" Both exceptions in designate/central/service.py Change-Id: I27395999b2002374a74bddad71333f508354f37b Closes-Bug: #1511230
-rw-r--r--designate/central/service.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/designate/central/service.py b/designate/central/service.py
index 24874c41..4a45ea6e 100644
--- a/designate/central/service.py
+++ b/designate/central/service.py
@@ -1422,7 +1422,7 @@ class Service(service.RPCService, service.Service):
policy.check('delete_recordset', context, target)
if recordset.managed and not context.edit_managed_records:
- raise exceptions.BadRequest('Managed records may not be updated')
+ raise exceptions.BadRequest('Managed records may not be deleted')
recordset, domain = self._delete_recordset_in_storage(
context, domain, recordset, increment_serial=increment_serial)
@@ -1659,7 +1659,7 @@ class Service(service.RPCService, service.Service):
policy.check('delete_record', context, target)
if recordset.managed and not context.edit_managed_records:
- raise exceptions.BadRequest('Managed records may not be updated')
+ raise exceptions.BadRequest('Managed records may not be deleted')
record, domain = self._delete_record_in_storage(
context, domain, record, increment_serial=increment_serial)