diff options
| author | Adam Young <ayoung@redhat.com> | 2011-01-26 14:24:41 -0500 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2011-01-27 16:52:52 -0500 |
| commit | 18ec29c42b6ee239396f0b28f8566fbb2261264c (patch) | |
| tree | d63ba68641c5e65f16867e04fa7530ba0711f53c | |
| parent | c3e065879056d85f0a769368c82b128a58c148e1 (diff) | |
| download | freeipa-18ec29c42b6ee239396f0b28f8566fbb2261264c.tar.gz freeipa-18ec29c42b6ee239396f0b28f8566fbb2261264c.tar.xz freeipa-18ec29c42b6ee239396f0b28f8566fbb2261264c.zip | |
adding label for RBAC
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 55 | ||||
| -rw-r--r-- | install/ui/webui.js | 3 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 3 |
3 files changed, 41 insertions, 20 deletions
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 8fe28684d..a4b9a0f79 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -4544,7 +4544,7 @@ "type": "tuple" }, { - "alwaysask": true, + "alwaysask": false, "attribute": false, "autofill": false, "class": "List", @@ -4553,7 +4553,10 @@ "default": null, "doc": "Comma-separated list of attributes", "exclude": null, - "flags": [], + "flags": [ + "ask_create", + "ask_update" + ], "hint": null, "include": null, "label": "Attributes", @@ -4567,7 +4570,7 @@ "type": "tuple" }, { - "alwaysask": true, + "alwaysask": false, "attribute": false, "autofill": false, "class": "StrEnum", @@ -4576,7 +4579,10 @@ "default": null, "doc": "Type of IPA object (user, group, host, hostgroup, service, netgroup, dns)", "exclude": null, - "flags": [], + "flags": [ + "ask_create", + "ask_update" + ], "hint": null, "include": null, "label": "Type", @@ -4597,7 +4603,7 @@ ] }, { - "alwaysask": true, + "alwaysask": false, "attribute": false, "autofill": false, "class": "Str", @@ -4606,7 +4612,10 @@ "default": null, "doc": "Target members of a group", "exclude": null, - "flags": [], + "flags": [ + "ask_create", + "ask_update" + ], "hint": null, "include": null, "label": "Member of group", @@ -4623,7 +4632,7 @@ "type": "unicode" }, { - "alwaysask": true, + "alwaysask": false, "attribute": false, "autofill": false, "class": "Str", @@ -4632,7 +4641,10 @@ "default": null, "doc": "Legal LDAP filter (e.g. ou=Engineering)", "exclude": null, - "flags": [], + "flags": [ + "ask_create", + "ask_update" + ], "hint": null, "include": null, "label": "Filter", @@ -4649,7 +4661,7 @@ "type": "unicode" }, { - "alwaysask": true, + "alwaysask": false, "attribute": false, "autofill": false, "class": "Str", @@ -4658,7 +4670,10 @@ "default": null, "doc": "Subtree to apply permissions to", "exclude": null, - "flags": [], + "flags": [ + "ask_create", + "ask_update" + ], "hint": null, "include": null, "label": "Subtree", @@ -4675,7 +4690,7 @@ "type": "unicode" }, { - "alwaysask": true, + "alwaysask": false, "attribute": false, "autofill": false, "class": "Str", @@ -4684,7 +4699,10 @@ "default": null, "doc": "User group to apply permissions to", "exclude": null, - "flags": [], + "flags": [ + "ask_create", + "ask_update" + ], "hint": null, "include": null, "label": "Target group", @@ -7399,6 +7417,7 @@ "identity": "Identity", "ipaserver": "IPA Server", "policy": "Policy", + "role": "Role Based Access Control", "sudo": "SUDO" } } @@ -7416,22 +7435,22 @@ "Administrator" ], "gidnumber": [ - "890800000" + "1256800000" ], "homedirectory": [ "/home/admin" ], "ipauniqueid": [ - "6b8e688e-28e1-11e0-b944-52540029a798" + "37800f46-2983-11e0-abc5-52540029a798" ], "krblastpwdchange": [ - "20110126001724Z" + "20110126193538Z" ], "krblastsuccessfulauth": [ - "20110126002302Z" + "20110126194824Z" ], "krbpasswordexpiration": [ - "20110426001724Z" + "20110426193538Z" ], "krbprincipalname": [ "admin@IPA14.AYOUNG.BOSTON.DEVEL.REDHAT.COM" @@ -7461,7 +7480,7 @@ "admin" ], "uidnumber": [ - "890800000" + "1256800000" ] } ], diff --git a/install/ui/webui.js b/install/ui/webui.js index 06b76c358..9459c9d1c 100644 --- a/install/ui/webui.js +++ b/install/ui/webui.js @@ -51,7 +51,8 @@ IPA.admin_tab_set = function () { {name:'krbtpolicy', entity:'krbtpolicy'} ]}, {name:'ipaserver', label: IPA.messages.tabs.ipaserver, children: [ - {name:'role',entity:'role' ,children:[ + {name:'role',entity:'role', label: IPA.messages.tabs.role + ,children:[ {name:'privilege',entity:'privilege' }, {name:'permission', entity:'permission'} ]}, diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 7f812962a..ab53a0538 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -110,7 +110,8 @@ class i18n_messages(Command): "audit": _("Audit"), "ipaserver":_("IPA Server"), "sudo":_("SUDO"), - "hbac":_("HBAC")}, + "hbac":_("HBAC"), + "role":_("Role Based Access Control")}, "association":{ "managedby":_("Managed by"), "members":_("Members"), |