Ticket: https://fedorahosted.org/freeipa/ticket/4647 Patch attached.
-- Martin Basti
From 98132a1ba593cb4b4390678a2037b9db92b5905b Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Thu, 13 Nov 2014 14:02:02 +0100 Subject: [PATCH] Fix warning message should not contain CLI commands Message is now universal for both CLI and WebUI Ticket: https://fedorahosted.org/freeipa/ticket/4647 --- ipalib/messages.py | 3 +-- ipalib/plugins/dns.py | 8 +++----- ipatests/test_xmlrpc/test_dns_plugin.py | 6 +++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ipalib/messages.py b/ipalib/messages.py index 5eeab3c54caf3a7318d89a4aeaee1357fceb787f..1e28cd1d6d572f7698ed3221e29c29160963ebad 100644 --- a/ipalib/messages.py +++ b/ipalib/messages.py @@ -175,8 +175,7 @@ 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 was changed: %(current_behavior)s.") class DNSServerNotRespondingWarning(PublicMessage): diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index dd1e640f4062a32921bf1edf316e122b81a6d485..133b562dc16aa78646c127265532a0a991bd5398 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -2369,11 +2369,9 @@ 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'.") + current_behavior=_( + u"the name server value is used only for setting up " + u"the SOA MNAME attribute"), ) ) diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index a34d11a3278c67a3d00ca8f59bb8d8d19cf8a46e..35579dec1912117e19a9cdaf6f54938cbaed75ca 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -497,9 +497,9 @@ 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 was changed: the name server value " + u"is used only for setting up the SOA MNAME " + u"attribute.", 'code': 13005, 'type': u'warning', 'name': u'OptionSemanticChangedWarning'}, -- 1.8.3.1
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
