diff options
| author | Martin Basti <mbasti@redhat.com> | 2014-11-13 14:02:02 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-11-19 15:20:55 +0100 |
| commit | 310e46452c41223afa0b1b318c503574567df105 (patch) | |
| tree | 1de9a6c787e70457280e5219f8002c46fbacc12e | |
| parent | 3c900ba7a8d98a72ff4e040b688fe3213c722a64 (diff) | |
| download | freeipa-310e46452c41223afa0b1b318c503574567df105.tar.gz freeipa-310e46452c41223afa0b1b318c503574567df105.tar.xz freeipa-310e46452c41223afa0b1b318c503574567df105.zip | |
Fix warning message should not contain CLI commands
Message is now universal for both CLI and WebUI
Ticket: https://fedorahosted.org/freeipa/ticket/4647
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
| -rw-r--r-- | ipalib/messages.py | 4 | ||||
| -rw-r--r-- | ipalib/plugins/dns.py | 9 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/test_dns_plugin.py | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/ipalib/messages.py b/ipalib/messages.py index 5eeab3c54..102e35275 100644 --- a/ipalib/messages.py +++ b/ipalib/messages.py @@ -175,8 +175,8 @@ class OptionSemanticChangedWarning(PublicMessage): errno = 13005 type = "warning" - format = _(u"semantic of '%(option)s' option was changed: " - u"%(current_behavior)s.\n%(hint)s") + format = _(u"Semantic of %(label)s was changed. %(current_behavior)s\n" + u"%(hint)s") class DNSServerNotRespondingWarning(PublicMessage): diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index dd1e640f4..c5d96a8c4 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -2369,11 +2369,10 @@ class dnszone(DNSZoneBase): messages.add_message( options['version'], result, messages.OptionSemanticChangedWarning( - option=u"--name-server", - current_behavior=_(u"the option is used only for " - u"setting up the SOA MNAME attribute"), - hint=_(u"To edit NS record(s) in zone apex, use command " - u"'dnsrecord-mod [zone] @ --ns-rec=nameserver'.") + label=_(u"setting Authoritative nameserver"), + current_behavior=_(u"It is used only for setting the " + u"SOA MNAME attribute."), + hint=_(u"NS record(s) can be edited in zone apex - '@'. ") ) ) diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index a34d11a32..fb5385314 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -497,9 +497,12 @@ class test_dns(Declarative): 'objectclass': objectclasses.dnszone, }, 'messages': ( - {'message': u"semantic of '--name-server' option was changed: the option is used only for setting up" - u" the SOA MNAME attribute.\nTo edit NS record(s) in zone apex, use command " - u"'dnsrecord-mod [zone] @ --ns-rec=nameserver'.", + {'message': u"Semantic of setting Authoritative nameserver " + u"was changed. " + u"It is used only for setting the SOA MNAME " + u"attribute.\n" + u"NS record(s) can be edited in zone " + u"apex - '@'. ", 'code': 13005, 'type': u'warning', 'name': u'OptionSemanticChangedWarning'}, |