diff --git a/install/ui/doc/categories.json b/install/ui/doc/categories.json
index a399b21cd..f5df41926 100644
--- a/install/ui/doc/categories.json
+++ b/install/ui/doc/categories.json
@@ -137,7 +137,8 @@
"classes": [
"*facet_policy",
"IPA.hide_empty_row_policy",
- "IPA.permission_target_policy"
+ "aci.permission_target_policy",
+ "aci.permission_managed_policy"
]
},
{
diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index 48a8c01fd..a65505695 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -977,6 +977,13 @@ table.scrollable tbody {
display: inline;
}
+.option_widget.columns > li {
+ float: left;
+ width: 33%;
+ min-width: 90px;
+ max-width: 150px;
+}
+
.combobox-widget-input {
display: inline-block;
position: relative;
diff --git a/install/ui/src/freeipa/Application_controller.js b/install/ui/src/freeipa/Application_controller.js
index a554f1663..b327f62a6 100644
--- a/install/ui/src/freeipa/Application_controller.js
+++ b/install/ui/src/freeipa/Application_controller.js
@@ -206,8 +206,12 @@ define([
details.append('
Web UI got in unrecoverable state during "'+error.phase+'" phase.
');
if (error.results) {
+ var msg = {
+ message: error.results.message,
+ stack: error.results.stack
+ };
details.append('Technical details:');
- details.append(''+JSON.stringify(error.results)+'
');
+ details.append(''+JSON.stringify(msg)+'
');
}
},
diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 7b0017856..9aab2d7ec 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -36,13 +36,19 @@ define([
* Widgets, entities and fields related to Access Control that means
* Permissions, Privilege, Role, Delegation and Self-service.
*
- * When loaded, this module is also accessible as `IPA.aci`.
- *
* @class aci
- * @alternateClassName IPA.aci
* @singleton
*/
-var exp = IPA.aci = {};
+var aci = {};
+
+/**
+ * List of fields which are disabled for managed permissions
+ * @property {Array}
+ */
+aci.managed_fields = [
+ 'ipapermright', 'extratargetfilter', 'memberof', 'ipapermlocation',
+ 'ipapermtarget', 'type'
+];
var make_permission_spec = function() {
@@ -55,63 +61,91 @@ return {
columns: [ 'cn' ]
},
{
- $factory: IPA.aci.permission_details_facet,
+ $factory: aci.permission_details_facet,
$type: 'details',
fields: [
{
name:'cn',
widget: 'identity.cn'
},
+ {
+ $type: 'radio',
+ name:'ipapermbindruletype',
+ widget: 'identity.ipapermbindruletype',
+ flags: ['w_if_no_aci']
+ },
{
$type: 'rights',
- name: 'permissions',
- widget: 'rights.permissions'
+ name: 'ipapermright',
+ widget: 'identity.ipapermright',
+ required: true,
+ flags: ['w_if_no_aci']
},
{
- $type: 'select',
- name: 'target',
- widget: 'target.target',
- enabled: false
+ $type: 'multivalued',
+ name: 'extratargetfilter',
+ widget: 'target.extratargetfilter',
+ acl_param: 'ipapermtargetfilter',
+ enabled: false,
+ flags: ['w_if_no_aci']
},
{
- name: 'filter',
- widget: 'target.filter',
- enabled: false
- },
- {
- $type: 'entity_select',
+ $type: 'multivalued',
name: 'memberof',
widget: 'target.memberof',
- enabled: false
+ enabled: false,
+ flags: ['w_if_no_aci']
},
{
- name: 'subtree',
- widget: 'target.subtree',
- enabled: false
+ name: 'ipapermlocation',
+ widget: 'target.ipapermlocation',
+ enabled: false,
+ flags: ['w_if_no_aci']
},
{
- $type: 'entity_select',
- name: 'targetgroup',
- widget: 'target.targetgroup',
- enabled: false
+ name: 'ipapermtarget',
+ widget: 'target.ipapermtarget',
+ enabled: false,
+ flags: ['w_if_no_aci']
},
{
$type: 'select',
name: 'type',
widget: 'target.type',
- enabled: false
+ enabled: false,
+ flags: ['w_if_no_aci']
+
},
{
name: 'attrs',
widget: 'target.attrs',
- enabled: false
+ enabled: false,
+ flags: ['w_if_no_aci']
},
{
name: 'attrs_multi',
param: 'attrs',
$type: 'multivalued',
widget: 'target.attrs_multi',
- enabled: false
+ enabled: false,
+ flags: ['w_if_no_aci']
+ },
+ {
+ name: 'ipapermdefaultattr',
+ $type: 'multivalued',
+ widget: 'managed.ipapermdefaultattr'
+ },
+ {
+ name: 'ipapermincludedattr',
+ $type: 'multivalued',
+ widget: 'managed.ipapermincludedattr',
+ read_only: true
+ },
+ {
+ name: 'ipapermexcludedattr',
+ $type: 'multivalued',
+ widget: 'managed.ipapermexcludedattr',
+ read_only: true
}
],
widgets: [
@@ -120,17 +154,16 @@ return {
name: 'identity',
label: '@i18n:objects.permission.identity',
widgets: [
- 'cn'
- ]
- },
- {
- $type: 'details_section',
- name: 'rights',
- label: '@i18n:objects.permission.rights',
- widgets: [
+ 'cn',
+ {
+ $type: 'radio',
+ name: 'ipapermbindruletype',
+ options: ['permission', 'all', 'anonymous']
+ },
{
$type: 'rights',
- name: 'permissions'
+ name: 'ipapermright',
+ layout: 'columns'
}
]
},
@@ -138,13 +171,32 @@ return {
$type: 'permission_target',
container_factory: IPA.details_section,
label: '@i18n:objects.permission.target',
- name: 'target',
- show_target: false
+ name: 'target'
+ },
+ {
+ $type: 'details_section',
+ name: 'managed',
+ label: '@i18n:objects.permission.managed',
+ widgets: [
+ {
+ $type: 'multivalued',
+ name: 'ipapermdefaultattr'
+ },
+ {
+ $type: 'multivalued',
+ name: 'ipapermincludedattr'
+ },
+ {
+ $type: 'multivalued',
+ name: 'ipapermexcludedattr'
+ }
+ ]
}
],
policies: [
+ aci.permission_managed_policy,
{
- $factory: IPA.permission_target_policy,
+ $factory: aci.permission_target_policy,
widget_name: 'target'
}
]
@@ -162,37 +214,38 @@ return {
name:'cn',
widget: 'general.cn'
},
+ {
+ $type: 'radio',
+ name:'ipapermbindruletype',
+ widget: 'general.ipapermbindruletype'
+ },
{
$type: 'rights',
- name: 'permissions',
- widget: 'general.permissions'
+ name: 'ipapermright',
+ widget: 'general.ipapermright',
+ required: true
},
{
- $type: 'select',
- name: 'target',
- widget: 'target.target',
+ $type: 'multivalued',
+ name: 'extratargetfilter',
+ widget: 'target.extratargetfilter',
+ acl_param: 'ipapermtargetfilter',
enabled: false
},
{
- name: 'filter',
- widget: 'target.filter',
- enabled: false
- },
- {
- $type: 'entity_select',
+ $type: 'multivalued',
name: 'memberof',
widget: 'target.memberof',
enabled: false
},
{
- name: 'subtree',
- widget: 'target.subtree',
+ name: 'ipapermlocation',
+ widget: 'target.ipapermlocation',
enabled: false
},
{
- $type: 'entity_select',
- name: 'targetgroup',
- widget: 'target.targetgroup',
+ name: 'ipapermtarget',
+ widget: 'target.ipapermtarget',
enabled: false
},
{
@@ -220,21 +273,27 @@ return {
name: 'general',
widgets: [
'cn',
+ {
+ $type: 'radio',
+ name: 'ipapermbindruletype',
+ options: ['permission', 'all', 'anonymous'],
+ default_value: 'permission'
+ },
{
$type: 'rights',
- name: 'permissions'
+ name: 'ipapermright',
+ layout: 'columns'
}
]
},
{
$type: 'permission_target',
- name:'target',
- show_target: true
+ name:'target'
}
],
policies: [
{
- $factory: IPA.permission_target_policy,
+ $factory: aci.permission_target_policy,
widget_name: 'target'
}
]
@@ -245,7 +304,7 @@ return {
* @class aci.permission_details_facet
* @extends details.details_facet
*/
-IPA.aci.permission_details_facet = function(spec) {
+aci.permission_details_facet = function(spec) {
var that = IPA.details_facet(spec);
@@ -297,7 +356,8 @@ return {
name: 'memberof_permission',
facet_group: 'permission',
add_method: 'add_permission',
- remove_method: 'remove_permission'
+ remove_method: 'remove_permission',
+ search_options: { 'ipapermbindruletype': 'permission' }
}
],
standard_association_facets: true,
@@ -478,10 +538,10 @@ return {
};};
/**
- * @class IPA.attributes_widget
+ * @class aci.attributes_widget
* @extends IPA.checkboxes_widget
*/
-IPA.attributes_widget = function(spec) {
+aci.attributes_widget = function(spec) {
spec = spec || {};
@@ -540,13 +600,14 @@ IPA.attributes_widget = function(spec) {
var tbody = $('tbody', that.table);
for (var i=0; i').appendTo(tbody);
var td = $(' | ').appendTo(tr);
var name = that.get_input_name();
var id = that._option_next_id + name;
- IPA.standalone_option({
+ var opt = IPA.standalone_option({
id: id,
type: 'checkbox',
name: name,
@@ -561,6 +622,7 @@ IPA.attributes_widget = function(spec) {
text: value,
'for': id
}));
+ option.input_node = opt[0];
that.new_option_id();
}
};
@@ -582,6 +644,7 @@ IPA.attributes_widget = function(spec) {
that.populate(that.object_type);
that.append();
+ that.create_options(that.options);
that.owb_update(values);
};
@@ -597,7 +660,6 @@ IPA.attributes_widget = function(spec) {
var aciattrs = metadata.aciattrs;
that.options = that.prepare_options(aciattrs);
- that.create_options(aciattrs);
};
that.append = function() {
@@ -614,7 +676,6 @@ IPA.attributes_widget = function(spec) {
if (unmatched.length > 0 && !that.skip_unmatched) {
that.options.push.apply(that.options, that.prepare_options(unmatched));
- that.create_options(unmatched);
}
};
@@ -634,14 +695,14 @@ IPA.attributes_widget = function(spec) {
};
/**
- * @class IPA.rights_widget
+ * @class aci.rights_widget
* @extends IPA.checkboxes_widget
*/
-IPA.rights_widget = function(spec) {
+aci.rights_widget = function(spec) {
var that = IPA.checkboxes_widget(spec);
- that.rights = ['write', 'add', 'delete'];
+ that.rights = ['read', 'search', 'compare', 'write', 'add', 'delete', 'all'];
for (var i=0; i use it as pristine value so undo will
+ // work correctly.
+ var loc = [IPA.env.basedn];
+ loc_w.update(loc);
+ loc_f.values = loc;
+ } else {
+ attrs = attr_multi.save();
+ attr_table.update(attrs);
+ // notification will be done by `set_attrs_type`
+ }
+ }
+
+ that.set_attrs_type(type, true);
+ };
+
that.set_attrs_type = function(type, skip_unmatched) {
var attribute_field = that.container.fields.get_field('attrs');
var attribute_table = that.permission_target.widgets.get_widget('attrs');
@@ -824,16 +895,19 @@ IPA.permission_target_policy = function (spec) {
};
that.post_create = function() {
- that.select_target(that.permission_target.targets[0]);
+ that.select_target(aci.default_target);
};
that.post_load = function(data) {
- var displayed_target;
+ var displayed_target = 'general';
+ var permtype = data.result.result.ipapermissiontype;
+ that.managed = permtype && permtype.indexOf("MANAGED") > -1;
+ that.system = permtype && permtype.indexOf("SYSTEM") > -1 && permtype.length === 1;
for (var target in that.target_mapping) {
-
- if (data.result.result[target]) {
+ var property = that.target_mapping[target].property;
+ if (property && data.result.result[property]) {
displayed_target = target;
} else {
that.set_target_visible(target, false);
@@ -855,42 +929,42 @@ IPA.permission_target_policy = function (spec) {
that.set_target_visible = function(target, visible) {
var target_info = that.target_mapping[target];
- that.set_target_visible_core(target_info, visible);
- };
- that.set_target_visible_core = function(target_info, visible) {
- var widget = that.permission_target.widgets.get_widget(target_info.name);
- var field = that.container.fields.get_field(target_info.name);
- that.permission_target.set_row_visible(target_info.name, visible);
- field.enabled = visible;
- field.set_required(visible && target_info.required);
- widget.hidden = !visible;
-
- if (target_info.additional) {
- for (var i=0; i -1;
+ var enabled = !(managed_f && that.managed) && visible && !that.system;
+ field.set_enabled(enabled);
+ field.set_required(visible && target_info.required);
+ widget.hidden = !visible;
+ };
that.target_mapping = {
- filter: {
- name: 'filter',
- required: true,
- additional: [
+ general: {
+ fields: [
{
- name: 'attrs_multi'
- }
- ]
- },
- subtree: {
- name: 'subtree',
- required: true,
- additional: [
+ name: 'extratargetfilter'
+ },
+ {
+ name: 'ipapermlocation',
+ required: true
+ },
+ {
+ name: 'ipapermtarget'
+ },
+ {
+ name: 'type'
+ },
{
name: 'memberof'
},
@@ -899,26 +973,23 @@ IPA.permission_target_policy = function (spec) {
}
]
},
- targetgroup: {
- name: 'targetgroup',
- required: true,
- additional: [
- {
- name: 'attrs'
- }
- ],
- action: function() {
- that.set_attrs_type('group', false);
- }
- },
type: {
- name: 'type',
- additional: [
+ property: 'type',
+ fields: [
+ {
+ name: 'extratargetfilter'
+ },
{
name: 'memberof'
},
+ {
+ name: 'type'
+ },
{
name: 'attrs'
+ },
+ {
+ name: 'ipapermtarget'
}
],
action: function() {
@@ -931,59 +1002,88 @@ IPA.permission_target_policy = function (spec) {
return that;
};
+/**
+ * Facet policy which shows and hides managed section based on presence
+ * "MANAGED" in ippapermissiontype attribute
+ * @class aci.permission_managed_policy
+ * @extends IPA.facet_policy
+ */
+aci.permission_managed_policy = function (spec) {
+
+ var that = IPA.facet_policy();
+
+ that.post_load = function(data) {
+ var permtype = data.result.result.ipapermissiontype;
+ var managed = permtype && permtype.indexOf("MANAGED") > -1;
+ var system = permtype && permtype.indexOf("SYSTEM") > -1 && permtype.length === 1;
+ var m_section = that.container.widgets.get_widget("managed");
+ m_section.set_visible(managed);
+
+ var fields = that.container.fields.get_fields();
+ for (var i=0, l=fields.length; i -1;
+ field.set_enabled(!system && !(managed_f && managed));
+ }
+ };
+
+ return that;
+};
+
/**
* Permission entity spec
* @member aci
*/
-exp.permission_entity_spec = make_permission_spec();
+aci.permission_entity_spec = make_permission_spec();
/**
* Privilege entity spec
* @member aci
*/
-exp.privilege_entity_spec = make_privilege_spec();
+aci.privilege_entity_spec = make_privilege_spec();
/**
* Role entity spec
* @member aci
*/
-exp.role_entity_spec = make_role_spec();
+aci.role_entity_spec = make_role_spec();
/**
* Self-service entity spec
* @member aci
*/
-exp.selfservice_entity_spec = make_selfservice_spec();
+aci.selfservice_entity_spec = make_selfservice_spec();
/**
* Delegation entity spec
* @member aci
*/
-exp.delegation_entity_spec = make_delegation_spec();
+aci.delegation_entity_spec = make_delegation_spec();
/**
* Register entities, widgets and fields to global registers.
* @member aci
*/
-exp.register = function() {
+aci.register = function() {
var e = reg.entity;
var w = reg.widget;
var f = reg.field;
- e.register({ type: 'permission', spec: exp.permission_entity_spec });
- e.register({ type: 'privilege', spec: exp.privilege_entity_spec });
- e.register({ type: 'role', spec: exp.role_entity_spec });
- e.register({ type: 'selfservice', spec: exp.selfservice_entity_spec });
- e.register({ type: 'delegation', spec: exp.delegation_entity_spec });
+ e.register({ type: 'permission', spec: aci.permission_entity_spec });
+ e.register({ type: 'privilege', spec: aci.privilege_entity_spec });
+ e.register({ type: 'role', spec: aci.role_entity_spec });
+ e.register({ type: 'selfservice', spec: aci.selfservice_entity_spec });
+ e.register({ type: 'delegation', spec: aci.delegation_entity_spec });
- w.register('attributes', IPA.attributes_widget);
+ w.register('attributes', aci.attributes_widget);
f.register('attributes', IPA.checkboxes_field);
- w.register('rights', IPA.rights_widget);
+ w.register('rights', aci.rights_widget);
f.register('rights', IPA.checkboxes_field);
- w.register('permission_target', IPA.permission_target_widget);
+ w.register('permission_target', aci.permission_target_widget);
};
-phases.on('registration', exp.register);
+phases.on('registration', aci.register);
-return exp;
+return aci;
});
\ No newline at end of file
diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js
index 685821e0a..0c337bdff 100644
--- a/install/ui/src/freeipa/association.js
+++ b/install/ui/src/freeipa/association.js
@@ -23,6 +23,7 @@
* the AssociationList elements; IT NEEDS IT'S OWN CODE! */
define([
+ 'dojo/_base/lang',
'dojo/Deferred',
'./metadata',
'./ipa',
@@ -35,7 +36,7 @@ define([
'./facet',
'./search',
'./dialog'],
- function(Deferred, metadata_provider, IPA, $, navigation,
+ function(lang, Deferred, metadata_provider, IPA, $, navigation,
phases, reg, su, text) {
/**
@@ -233,6 +234,12 @@ IPA.association_adder_dialog = function(spec) {
that.entity = IPA.get_entity(spec.entity);
that.pkey = spec.pkey;
+ /**
+ * Map of options for search method
+ * @property {Object}
+ */
+ that.search_options = spec.search_options;
+
that.other_entity = IPA.get_entity(spec.other_entity);
that.attribute_member = spec.attribute_member;
@@ -277,6 +284,10 @@ IPA.association_adder_dialog = function(spec) {
}
var options = { all: true };
+ if (that.search_options) {
+ lang.mixin(options, that.search_options);
+ }
+
var relationships = that.other_entity.metadata.relationships;
/* TODO: better generic handling of different relationships! */
@@ -947,6 +958,12 @@ exp.association_facet = IPA.association_facet = function (spec, no_init) {
that.adder_columns = $.ordered_map();
+ /**
+ * Map of search options for adder dialog
+ * @property {Object}
+ */
+ that.search_options = spec.search_options;
+
that.get_adder_column = function(name) {
return that.adder_columns.get(name);
};
@@ -1110,7 +1127,8 @@ exp.association_facet = IPA.association_facet = function (spec, no_init) {
pkey: pkey,
other_entity: that.other_entity,
attribute_member: that.attribute_member,
- exclude: pkeys
+ exclude: pkeys,
+ search_options: that.search_options
});
var adder_columns = that.adder_columns.values;
diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js
index 830e2a337..206b55ab8 100644
--- a/install/ui/src/freeipa/details.js
+++ b/install/ui/src/freeipa/details.js
@@ -684,7 +684,7 @@ exp.details_facet = IPA.details_facet = function(spec, no_init) {
that.is_dirty = function() {
var fields = that.fields.get_fields();
for (var i=0; i', { name: 'value'});
- row.widget = that.widget_factory({
- name: that.name+'-'+row_index,
- undo: that.undo || row.is_new,
- read_only: that.read_only,
- writable: that.writable,
- enabled: that.enabled
- });
+ var spec = that.child_spec || {};
+ if (typeof spec !== 'function') {
+ lang.mixin(spec, {
+ name: that.name+'-'+row_index,
+ undo: that.undo || row.is_new,
+ read_only: that.read_only,
+ writable: that.writable,
+ enabled: that.enabled
+ });
+ }
+ row.widget = builder.build('widget', spec);
row.widget.create(row.container);
row.original_values = values;
@@ -1415,7 +1419,7 @@ IPA.option_widget_base = function(spec, that) {
that.set_enabled = function(enabled) {
- that.enabled = enabled;
+ that.widget_set_enabled(enabled);
that.update_enabled(enabled);
};
@@ -4718,7 +4722,7 @@ IPA.widget_builder = function(spec) {
IPA.sshkeys_widget = function(spec) {
spec = spec || {};
- spec.widget_factory = IPA.sshkey_widget;
+ spec.child_spec = IPA.sshkey_widget;
var that = IPA.multivalued_widget(spec);
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index d400fb319..17db5b5d6 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -1,5 +1,6 @@
/* Authors:
* Adam Young
+ * Petr Vobornik
*
* Copyright (C) 2010 Red Hat
* see file 'COPYING' for use and warranty information
@@ -59,31 +60,32 @@ module('aci', {
entity: entity,
fields: [
{
- $type: 'select',
+ $type: 'radio',
name: 'target',
widget: 'target.target',
enabled: false
},
{
- name: 'filter',
- widget: 'target.filter',
+ $type: 'multivalued',
+ name: 'extratargetfilter',
+ widget: 'target.extratargetfilter',
+ acl_param: 'ipapermtargetfilter',
enabled: false
},
{
- $type: 'entity_select',
+ $type: 'multivalued',
name: 'memberof',
widget: 'target.memberof',
enabled: false
},
{
- name: 'subtree',
- widget: 'target.subtree',
+ name: 'ipapermlocation',
+ widget: 'target.ipapermlocation',
enabled: false
},
{
- $type: 'entity_select',
- name: 'targetgroup',
- widget: 'target.targetgroup',
+ name: 'ipapermtarget',
+ widget: 'target.ipapermtarget',
enabled: false
},
{
@@ -108,7 +110,7 @@ module('aci', {
widgets: [
{
$type: 'permission_target',
- container_factory: IPA.details_table_section,
+ container_factory: IPA.details_section,
group_entity: group_entity,
name: 'target',
label: 'Target',
@@ -117,7 +119,7 @@ module('aci', {
],
policies: [
{
- $factory: IPA.permission_target_policy,
+ $factory: aci.permission_target_policy,
widget_name: 'target'
}
]
@@ -129,12 +131,12 @@ module('aci', {
target_widget = target_facet.widgets.get_widget('target');
},
teardown: function() {
- target_container.remove();
+ target_container.remove();
}}
);
-test("IPA.attributes_widget.", function() {
+test("aci.attributes_widget", function() {
var aciattrs = md.source.objects.user.aciattrs;
@@ -142,7 +144,7 @@ test("IPA.attributes_widget.", function() {
name: 'attrs'
});
- var widget = IPA.attributes_widget({
+ var widget = aci.attributes_widget({
name: 'attrs',
object_type: 'user',
entity:entity
@@ -156,6 +158,7 @@ test("IPA.attributes_widget.", function() {
table,
'Widget contains table');
+ widget.update({});
var tr = $('tbody tr', table);
same(
@@ -187,13 +190,13 @@ test("IPA.attributes_widget.", function() {
'All loaded values are saved and sorted');
});
-test("IPA.rights_widget.", function() {
+test("aci.rights_widget.", function() {
var container = $('', {
name: 'permissions'
});
- var widget = IPA.rights_widget({
+ var widget = aci.rights_widget({
name: 'permissions',
entity:entity
});
@@ -224,25 +227,6 @@ var get_visible_rows = function(section) {
return visible;
};
-test("Testing aci grouptarget.", function() {
- var data = {};
- data.result = {};
- data.result.result = {
- targetgroup: 'ipausers'
- };
-
- target_facet.load(data);
-
- same(target_widget.target, 'targetgroup' , 'group control selected');
-
-
- same(get_visible_rows(target_widget), ['targetgroup', 'attrs'],
- 'group select row visible');
-
- ok ($('option', target_widget.group_select.container).length > 2,
- 'group select populated');
-
-});
test("Testing type target.", function() {
var data = {};
@@ -262,7 +246,8 @@ test("Testing type target.", function() {
same(record.type[0], data.result.result.type,
"saved type matches sample data");
- same(get_visible_rows(target_widget), ['memberof', 'type', 'attrs'],
+ same(get_visible_rows(target_widget), ['type', 'extratargetfilter',
+ 'ipapermtarget', 'memberof', 'attrs'],
'type and attrs rows visible');
ok((record.attrs.length > 10),
@@ -270,12 +255,12 @@ test("Testing type target.", function() {
});
-test("Testing filter target.", function() {
+test("Testing general target.", function() {
var data = {};
data.result = {};
data.result.result = {
- filter: 'somevalue'
+ extratargetfilter: 'somevalue'
};
target_facet.load(data);
@@ -283,30 +268,13 @@ test("Testing filter target.", function() {
var record = {};
target_facet.save(record);
- same(target_widget.target, 'filter', 'filter selected');
+ same(target_widget.target, 'general', 'general selected');
- same(get_visible_rows(target_widget), ['filter', 'attrs_multi'], 'filter row visible');
+ same(get_visible_rows(target_widget), ['type', 'ipapermlocation',
+ 'extratargetfilter', 'ipapermtarget', 'memberof',
+ 'attrs_multi'], 'general target fields visible');
- ok(record.filter[0], data.result.result.filter, 'filter set correctly');
-});
-
-
-
-test("Testing subtree target.", function() {
-
- var data = {};
- data.result = {};
- data.result.result = {
- subtree: 'ldap:///cn=*,cn=roles,cn=accounts,dc=example,dc=co'
- };
-
- target_facet.load(data);
- var record = {};
- target_facet.save(record);
-
- same(record.subtree[0], data.result.result.subtree, 'subtree set correctly');
-
- same(get_visible_rows(target_widget), ['memberof', 'subtree', 'attrs_multi'], 'subtree row visible');
+ same(record.extratargetfilter[0], data.result.result.extratargetfilter, 'filter set correctly');
});
};});
\ No newline at end of file
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 9ea39db5c..e7c58e66c 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -371,9 +371,8 @@
"enable": "Enable token"
},
"permission": {
- "identity": "Identity",
- "invalid_target": "Permission with invalid target specification",
- "rights": "Rights",
+ "identity": "Permission settings",
+ "managed": "Attribute breakdown",
"target": "Target"
},
"privilege": {
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 41732d670..b20597ef2 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -506,9 +506,8 @@ class i18n_messages(Command):
"enable": "Enable token",
},
"permission": {
- "identity": _("Identity"),
- "invalid_target": _("Permission with invalid target specification"),
- "rights": _("Rights"),
+ "identity": _("Permission settings"),
+ "managed": _("Attribute breakdown"),
"target": _("Target"),
},
"privilege": {
diff --git a/ipatests/test_webui/test_rbac.py b/ipatests/test_webui/test_rbac.py
index e05453f83..e785131f5 100644
--- a/ipatests/test_webui/test_rbac.py
+++ b/ipatests/test_webui/test_rbac.py
@@ -57,11 +57,14 @@ PERMISSION_DATA = {
'pkey': PERMISSION_PKEY,
'add': [
('textbox', 'cn', PERMISSION_PKEY),
- ('checkbox', 'permissions', 'write'),
- ('textbox', 'filter', 'cn=user'),
+ ('checkbox', 'ipapermright', 'write'),
+ ('checkbox', 'ipapermright', 'read'),
+ ('selectbox', 'type', 'user'),
+ ('table', 'attrs', 'audio'),
+ ('table', 'attrs', 'cn'),
],
'mod': [
- ('textbox', 'filter', 'cn=user2'),
+ ('table', 'attrs', 'carlicense'),
],
}