IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning message should not contain CLI commands

Browse Source 
Message is now universal for both CLI and WebUI

Ticket: https://fedorahosted.org/freeipa/ticket/4647
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Martin Basti 2014-11-13 14:02:02 +01:00 committed by Petr Vobornik
parent 3c900ba7a8
commit 310e46452c
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipalib/messages.py
View File

@ -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):

9
ipalib/plugins/dns.py
View File

@ -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 - '@'. ")
)
)

9
ipatests/test_xmlrpc/test_dns_plugin.py
View File

@ -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'},