pvomacka's pull request #85: "WebUI: Change group name from 'normal' to 'Non-POSIX'" was opened
PR body: """ It will correspond with CLI and will be more self-explanatory. https://fedorahosted.org/freeipa/ticket/6334 """ See the full pull-request at https://github.com/freeipa/freeipa/pull/85 ... or pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/85/head:pr85 git checkout pr85
From 3c639c648cfa56e9e81d4bc77bb90825bc4f9e2a Mon Sep 17 00:00:00 2001 From: Pavel Vomacka <pvoma...@redhat.com> Date: Wed, 14 Sep 2016 13:19:25 +0200 Subject: [PATCH] WebUI: Change group name from 'normal' to 'Non-POSIX' It will correspond with CLI and will be more self-explanatory. https://fedorahosted.org/freeipa/ticket/6334 --- install/ui/src/freeipa/group.js | 12 +++++------- install/ui/test/data/ipa_init.json | 2 +- ipaserver/plugins/internal.py | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js index b26560c..7a6bc91 100644 --- a/install/ui/src/freeipa/group.js +++ b/install/ui/src/freeipa/group.js @@ -62,7 +62,7 @@ return { name: 'external', param: 'objectclass', label: '@i18n:objects.group.type', - default_label: '@i18n:objects.group.normal', + default_label: '@i18n:objects.group.nonposix', value_map: { ipaexternalgroup: '@i18n:objects.group.external', posixgroup: '@i18n:objects.group.posix' @@ -174,8 +174,8 @@ return { default_value: 'posix', options: [ { - value: 'normal', - label: '@i18n:objects.group.normal' + value: 'nonposix', + label: '@i18n:objects.group.nonposix' }, { value: 'external', @@ -224,10 +224,8 @@ IPA.group_adder_dialog = function(spec) { var type_field = that.fields.get_field('type'); var type = type_field.save()[0]; - if (type === 'normal') { - command.set_option('nonposix', true); - } else if (type === 'external') { - command.set_option('external', true); + if (type === 'nonposix' || type === 'external') { + command.set_option(type, true); } return command; diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 6903f92..99851ab 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -373,7 +373,7 @@ "external": "External", "make_external": "Change to external group", "make_posix": "Change to POSIX group", - "normal": "Normal", + "nonposix": "Non-POSIX", "posix": "POSIX", "type": "Group Type" }, diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index c2819aa..530458d 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -524,7 +524,7 @@ class i18n_messages(Command): "external": _("External"), "make_external": _("Change to external group"), "make_posix": _("Change to POSIX group"), - "normal": _("Normal"), + "nonposix": _("Non-POSIX"), "posix": _("POSIX"), "type": _("Group Type"), },
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
