From 8d597dcbb03ca70a342f470e0229c9934f75cb16 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 8 Feb 2011 15:41:24 -0600
Subject: Moved add dialog into search facet.

Previously the add dialog is added into entity. The dialog is only
used by the search facet, so it's now moved into the search facet.
---
 install/ui/group.js | 59 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

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

diff --git a/install/ui/group.js b/install/ui/group.js
index 0188031f..f7e7e51f 100644
--- a/install/ui/group.js
+++ b/install/ui/group.js
@@ -29,21 +29,38 @@ IPA.entity_factories.group =  function () {
     return IPA.entity({
         'name': 'group'
     }).
-        facet(IPA.search_facet().
-              column({name:'cn'}).
-              column({name:'gidnumber'}).
-              column({name:'description'})).
         facet(
-            IPA.details_facet().section(
-                IPA.stanza({label: 'Group Settings' }).
-                    input({name: 'cn' }).
-                    input({name: 'description'}).
-                    input({name: 'gidnumber' }))).
-        facet( IPA.group_member_user_facet({
-            'name': 'member_user',
-            'label': 'Users',
-            'other_entity': 'user'
-        })).
+            IPA.search_facet().
+                column({name: 'cn'}).
+                column({name: 'gidnumber'}).
+                column({name: 'description'}).
+                dialog(
+                    IPA.add_dialog({
+                        'name': 'add',
+                        'title': 'Add New Group'
+                    }).
+                        field(IPA.text_widget({name: 'cn', undo: false})).
+                        field(IPA.text_widget({name: 'description', undo: false})).
+                        // TODO: Replace with i18n label
+                        field(IPA.checkbox_widget({
+                            name: 'posix',
+                            label: 'Is this a POSIX group?',
+                            undo: false,
+                            checked: 'checked'})).
+                        field(IPA.text_widget({name: 'gidnumber', undo: false})))).
+        facet(
+            IPA.details_facet().
+                section(
+                    IPA.stanza({label: 'Group Settings' }).
+                        input({name: 'cn' }).
+                        input({name: 'description'}).
+                        input({name: 'gidnumber' }))).
+        facet(
+            IPA.group_member_user_facet({
+                'name': 'member_user',
+                'label': 'Users',
+                'other_entity': 'user'
+            })).
         association({
             name: 'netgroup',
             associator: 'serial'
@@ -56,20 +73,6 @@ IPA.entity_factories.group =  function () {
             name: 'taskgroup',
             associator: 'serial'
         }).
-        add_dialog(
-            IPA.add_dialog({
-                'name': 'add',
-                'title': 'Add New Group'
-            }).
-                field(IPA.text_widget({name:'cn', undo: false})).
-                field(IPA.text_widget({name:'description', undo: false})).
-                // TODO: Replace with i18n label
-                field(IPA.checkbox_widget({
-                    name:'posix',
-                    label:'Is this a POSIX group?',
-                    undo: false,
-                    checked:'checked'})).
-                field(IPA.text_widget({name:'gidnumber', undo: false}))).
         standard_associations();
 };
 
-- 
cgit