From e806f32caeb517b12154bc1c02b8ad55b5b40f2d Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 28 Jan 2011 16:46:19 -0500
Subject: Add permission dialog adjustments.

The IPA.dialog has been modified to support sections. The add
dialog for permission has been modified to include the target
section. The base dialog classes have been moved from widget.js
into a new file called dialog.js.

This patch also includes ayoung's fix for parameter name and
format for the permission attributes.

https://fedorahosted.org/freeipa/ticket/791
---
 install/ui/aci.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'install/ui/aci.js')

diff --git a/install/ui/aci.js b/install/ui/aci.js
index 3f56cbed..6f3d218b 100644
--- a/install/ui/aci.js
+++ b/install/ui/aci.js
@@ -323,12 +323,14 @@ IPA.rights_section = function () {
 
 
 IPA.target_section = function () {
-    var    spec =  {
+
+    var spec =  {
         'name':'target',
         'label': 'Target'
     };
 
     var that = IPA.details_section(spec);
+
     var groupings = ['aci_by_type',  'aci_by_query', 'aci_by_group',
                      'aci_by_filter' ];
     var inputs = ['input', 'select', 'textarea'];
@@ -575,6 +577,14 @@ IPA.target_section = function () {
         }
     };
 
+    that.init = function() {
+        that.create_text({'name': 'targetgroup'});
+        that.create_textarea({'name': 'subtree'});
+        that.create_text({'name': 'type'});
+        that.create_text({'name': 'attrs'});
+        that.create_text({'name': 'filter'});
+    };
+
     that.save = function (record){
 
         var record_type = $("input[name='type']:checked").attr('id');
@@ -584,23 +594,13 @@ IPA.target_section = function () {
                 $('#aci_target_group_select option:selected').val();
         }else if (record_type === 'aci_by_type'){
             record.type = $('#object_type_select option:selected').val();
+            record.attrs =   that.attribute_table.save().join(',');
         }else if (record_type === 'aci_by_query'){
             record.subtree = $('#aci_query_text').val();
         }else if (record_type === 'aci_by_filter'){
             var filter =  $('#aci_filter').val();
             record.filter = filter;
         }
-
-        var attrs = $('.aci-attribute:checked').each(function(){
-            var id = this.id.split('-')[1];
-
-            if (!record.attributes){
-                record.attributes = "";
-            }else{
-                record.attributes += ",";
-            }
-            record.attributes += id;
-        });
     };
     return that;
 };
@@ -613,7 +613,8 @@ IPA.entity_factories.permission = function () {
     }).add_dialog(
         IPA.add_dialog({
             name: 'add',
-            title: 'Add New Permission'
+            title: 'Add New Permission',
+            width: '700px'
         }).
             field(IPA.text_widget({
                 name: 'cn',
@@ -624,8 +625,7 @@ IPA.entity_factories.permission = function () {
                 undo: false
             })).
             field(IPA.rights_widget({name:'permissions'})).
-            field(IPA.hidden_widget(
-                {name:'filter','value':'objectClass=changethisvalue'}))).
+            section(IPA.target_section())).
         facet(IPA.search_facet().
               column({name:'cn'}).
               column({name:'description'})).
-- 
cgit