diff options
| -rw-r--r-- | install/ui/doc/categories.json | 6 | ||||
| -rw-r--r-- | install/ui/src/freeipa/add.js | 2 | ||||
| -rw-r--r-- | install/ui/src/freeipa/idviews.js | 51 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 6 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 2 |
5 files changed, 63 insertions, 4 deletions
diff --git a/install/ui/doc/categories.json b/install/ui/doc/categories.json index e9507795b..c84077682 100644 --- a/install/ui/doc/categories.json +++ b/install/ui/doc/categories.json @@ -149,6 +149,12 @@ ] }, { + "name": "Dialog policies", + "classes": [ + "idviews.idoverride_adder_policy" + ] + }, + { "name": "Evaluators & Summaries", "classes": [ "*_evaluator", diff --git a/install/ui/src/freeipa/add.js b/install/ui/src/freeipa/add.js index 7f5c29807..8f24c7733 100644 --- a/install/ui/src/freeipa/add.js +++ b/install/ui/src/freeipa/add.js @@ -198,7 +198,7 @@ IPA.entity_adder_dialog = function(spec) { var field = fields[j]; var values = record[field.param]; - if (!values || values.length === 0) continue; + if (!values || values.length === 0 || !field.enabled) continue; if (field.flags.indexOf('no_command') > -1) continue; if (field.param === pkey_name) { diff --git a/install/ui/src/freeipa/idviews.js b/install/ui/src/freeipa/idviews.js index 1d082c4d4..cbc78ae7c 100644 --- a/install/ui/src/freeipa/idviews.js +++ b/install/ui/src/freeipa/idviews.js @@ -20,6 +20,7 @@ */ define([ + 'dojo/on', './ipa', './jquery', './menu', @@ -31,7 +32,7 @@ define([ './facet', './search', './entity'], - function(IPA, $, menu, phases, reg, rpc, text, mod_details, mod_facet) { + function(on, IPA, $, menu, phases, reg, rpc, text, mod_details, mod_facet) { /** * ID Views module * @class @@ -268,6 +269,9 @@ return { ], adder_dialog: { + policies: [ + { $factory: idviews.idoverride_adder_policy } + ], fields: [ { $type: 'entity_select', @@ -278,6 +282,14 @@ return { editable: true, tooltip: '@i18n:objects.idoverrideuser.anchor_tooltip' }, + { + label: '@i18n:objects.idoverrideuser.anchor_label', + name: 'ipaanchoruuid_default', + param: 'ipaanchoruuid', + tooltip: '@i18n:objects.idoverrideuser.anchor_tooltip_ad', + visible: false, + enabled: false + }, 'uid', 'gecos', 'uidnumber', @@ -341,6 +353,9 @@ return { ], adder_dialog: { + policies: [ + { $factory: idviews.idoverride_adder_policy } + ], fields: [ { $type: 'entity_select', @@ -351,6 +366,14 @@ return { editable: true, tooltip: '@i18n:objects.idoverridegroup.anchor_tooltip' }, + { + label: '@i18n:objects.idoverridegroup.anchor_label', + name: 'ipaanchoruuid_default', + param: 'ipaanchoruuid', + tooltip: '@i18n:objects.idoverridegroup.anchor_tooltip_ad', + visible: false, + enabled: false + }, 'cn', 'gidnumber', { @@ -406,6 +429,32 @@ idviews.idview_facet_header = function(spec) { }; /** + * Switches between combobox and textbox for ipaanchoruuid, depending on if + * current view is Default Trust View + * @class idviews.idoverride_adder_policy + * @extends IPA.facet_policy + */ +idviews.idoverride_adder_policy = function (spec) { + var that = IPA.facet_policy(spec); + that.init = function() { + on(that.container, 'open', that.on_open); + }; + + that.on_open = function() { + var d = that.container; // dialog + var default_view = d.pkey_prefix.slice(-1)[0] === idviews.DEFAULT_TRUST_VIEW; + var f1 = d.fields.get_field('ipaanchoruuid'); + var f2 = d.fields.get_field('ipaanchoruuid_default'); + f1.set_enabled(!default_view); + f1.widget.set_visible(!default_view); + f2.set_enabled(default_view); + f2.widget.set_visible(default_view); + }; + + return that; +}; + +/** * Apply Id view on hosts on hostgroup action base class * * @class idviews.apply_action diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index c4ea2acef..bbe334b7d 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -373,11 +373,13 @@ }, "idoverrideuser": { "anchor_label": "User to override", - "anchor_tooltip": "Enter trusted or IPA user login. Note: search doesn't list users from trusted domains." + "anchor_tooltip": "Enter trusted or IPA user login. Note: search doesn't list users from trusted domains.", + "anchor_tooltip_ad": "Enter trusted user login." }, "idoverridegroup": { "anchor_label": "Group to override", - "anchor_tooltip": "Enter trusted or IPA group name. Note: search doesn't list groups from trusted domains." + "anchor_tooltip": "Enter trusted or IPA group name. Note: search doesn't list groups from trusted domains.", + "anchor_tooltip_ad": "Enter trusted group name." }, "idview": { "appliesto_tab": "${primary_key} applies to:", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 891dc5d75..b85f2d077 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -518,10 +518,12 @@ class i18n_messages(Command): "idoverrideuser": { "anchor_label": _("User to override"), "anchor_tooltip": _("Enter trusted or IPA user login. Note: search doesn't list users from trusted domains."), + "anchor_tooltip_ad": _("Enter trusted user login."), }, "idoverridegroup": { "anchor_label": _("Group to override"), "anchor_tooltip": _("Enter trusted or IPA group name. Note: search doesn't list groups from trusted domains."), + "anchor_tooltip_ad": _("Enter trusted group name."), }, "idview": { "appliesto_tab": _("${primary_key} applies to:"), |