IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

WebUI: Change structure of Identity submenu

Browse Source 
Previously there were 'User Groups', 'Host Groups' and 'Netgroups'
separately, now these three items are grouped into one named 'Groups'
which has sidebar with three items mentioned above.

This change allows us to move ID views into Identity submenu.

https://pagure.io/freeipa/issue/6717

Reviewed-By: Simo Sorce <ssorce@redhat.com>
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Pavel Vomacka 2017-03-02 10:31:48 +01:00 committed by Tomas Krizek
parent aa8530b7af
commit 070bc48dd6
No known key found for this signature in database
GPG Key ID: 22A2A94B5E49415A
5 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install/ui/src/freeipa/group.js
View File

@ -32,7 +32,17 @@ define([
'./entity'],
function(on, IPA, $, phases, reg) {
var exp = IPA.group = {};
var exp = IPA.group = {
search_facet_group: {
name: 'search',
label: '@i18n:objects.group.group_categories',
facets: {
search_group: 'group_search',
search_hostgroup: 'hostgroup_search',
search_netgroup: 'netgroup_search'
}
}
};
var make_spec = function() {
return {
@ -40,6 +50,10 @@ return {
facets: [
{
$type: 'search',
tab_label: '@i18n:objects.group.user_groups',
facet_groups: [IPA.group.search_facet_group],
tabs_in_sidebar: true,
disable_facet_tabs: false,
columns: [
'cn',
'gidnumber',

6
install/ui/src/freeipa/hostgroup.js
View File

@ -38,6 +38,10 @@ return {
facets: [
{
$type: 'search',
tab_label: '@i18n:objects.hostgroup.host_group',
facet_groups: [IPA.group.search_facet_group],
tabs_in_sidebar: true,
disable_facet_tabs: false,
columns: [
'cn',
'description'
@ -105,4 +109,4 @@ exp.register = function() {
phases.on('registration', exp.register);
return exp;
});
});

22
install/ui/src/freeipa/navigation/menu_spec.js
View File

@ -52,11 +52,26 @@ var nav = {};
}
]
},
{ entity: 'group' },
{ entity: 'host' },
{ entity: 'hostgroup' },
{ entity: 'netgroup' },
{ entity: 'service' },
{
entity: 'group',
label: '@i18n:objects.group.groups',
facet: 'search',
children: [
{
entity: 'hostgroup',
facet: 'search',
hidden: true
},
{
entity: 'netgroup',
facet: 'search',
hidden: true
}
]
},
{ entity: 'idview' },
{
name: 'automember',
label: '@i18n:tabs.automember',
@ -201,7 +216,6 @@ var nav = {};
]
},
{ entity: 'idrange' },
{ entity: 'idview' },
{ entity: 'realmdomains' },
{
name: 'trusts',

6
install/ui/src/freeipa/netgroup.js
View File

@ -43,6 +43,10 @@ var spec = {
facets: [
{
$type: 'search',
tab_label: '@i18n:objects.netgroup.netgroups',
facet_groups: [IPA.group.search_facet_group],
tabs_in_sidebar: true,
disable_facet_tabs: false,
columns: [
'cn',
'description'
@ -328,4 +332,4 @@ exp.register = function() {
phases.on('registration', exp.register);
return exp;
});
});

5
ipaserver/plugins/internal.py
View File

@ -522,11 +522,14 @@ class i18n_messages(Command):
"group": {
"details": _("Group Settings"),
"external": _("External"),
"groups": _("Groups"),
"group_categories": _("Group categories"),
"make_external": _("Change to external group"),
"make_posix": _("Change to POSIX group"),
"nonposix": _("Non-POSIX"),
"posix": _("POSIX"),
"type": _("Group Type"),
"user_groups": _("User Groups"),
},
"hbacrule": {
"any_host": _("Any Host"),
@ -587,6 +590,7 @@ class i18n_messages(Command):
"unprovisioned": _("Host unprovisioned"),
},
"hostgroup": {
"host_group": _("Host Groups"),
"identity": _("Host Group Settings"),
},
"idoverrideuser": {
@ -629,6 +633,7 @@ class i18n_messages(Command):
"hostgroups": _("Host Groups"),
"hosts": _("Hosts"),
"identity": _("Netgroup Settings"),
"netgroups": _("Netgroups"),
"specified_hosts": _("Specified Hosts and Groups"),
"specified_users": _("Specified Users and Groups"),
"user": _("User"),