From 07ace112afeaadade0ca372fe23a9432c2c9780f Mon Sep 17 00:00:00 2001 From: Adam Young Date: Mon, 25 Oct 2010 19:55:57 -0400 Subject: aci ui Implements the role, privilege, permission, delegation and selfservice entities ui. Targetgroup has been added to the object types. The groups lists need to be filter. The filter is currently hidden, with a hyperlink that reads 'filter' to unhide it. Each keystroke in this filter performs an AJAX request to the server. There are bugs on the server side that block some of the functionality from completing Creating a Permission requires one of 4 target types. The add dialog in this version assumes the user will want to create a filter type. They can change this on the edit page. Most search results come back with the values as arrays, but ACIs seem not to. Search and details both required special code to handle non-arrays. The unit tests now make use of the 'module' aspect of QUnit. This means that future unit test will also need to specify the module. The advantage is that multiple tests can share a common setup and teardown. Bugs that need to be fixed before this works 100% are https://fedorahosted.org/freeipa/ticket/634 https://fedorahosted.org/freeipa/ticket/633 --- ipalib/plugins/delegation.py | 2 ++ ipalib/plugins/selfservice.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'ipalib') diff --git a/ipalib/plugins/delegation.py b/ipalib/plugins/delegation.py index f68e7799f..6ed224421 100644 --- a/ipalib/plugins/delegation.py +++ b/ipalib/plugins/delegation.py @@ -138,6 +138,8 @@ class delegation(Object): json_dict = dict( (a, getattr(self, a)) for a in json_friendly_attributes ) + json_dict['primary_key'] = self.primary_key.name + json_dict['methods'] = [m for m in self.methods] return json_dict diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py index bf1eccfde..9152895a5 100644 --- a/ipalib/plugins/selfservice.py +++ b/ipalib/plugins/selfservice.py @@ -70,7 +70,7 @@ class selfservice(Object): bindable = False object_name = 'selfservice', object_name_plural = 'selfservice', - label = _('Permissions') + label = _('Self Service Permissions') takes_params = ( Str('aciname', @@ -101,6 +101,7 @@ class selfservice(Object): json_dict = dict( (a, getattr(self, a)) for a in json_friendly_attributes ) + json_dict['primary_key'] = self.primary_key.name json_dict['methods'] = [m for m in self.methods] return json_dict -- cgit