1 files changed, 48 insertions, 40 deletions
diff --git a/install/ui/user.js b/install/ui/user.js
index ba25b006..65d3de72 100644
--- a/install/ui/user.js
+++ b/install/ui/user.js
@@ -55,34 +55,36 @@ IPA.user.entity = function(spec) {
                 'telephonenumber',
                 'title'
             ],
-            control_buttons: {
-                buttons: [
-                    {
-                        name: 'disable',
-                        label: IPA.messages.buttons.disable,
-                        icon: 'disabled-icon',
-                        needs_confirm: true,
-                        hide_cond: ['self-service'],
-                        action: {
-                            factory: IPA.batch_items_action,
-                            method: 'disable',
-                            enable_cond: ['item-selected']
-                        }
-                    },
-                    {
-                        name: 'enable',
-                        label: IPA.messages.buttons.enable,
-                        icon: 'enabled-icon',
-                        needs_confirm: true,
-                        hide_cond: ['self-service'],
-                        action: {
-                            factory: IPA.batch_items_action,
-                            method: 'enable',
-                            enable_cond: ['item-selected']
-                        }
-                    }
-                ]
-            }
+            actions: [
+                {
+                    name: 'disable',
+                    factory: IPA.batch_items_action,
+                    method: 'disable',
+                    needs_confirm: true,
+                    hide_cond: ['self-service'],
+                    enable_cond: ['item-selected']
+                },
+                {
+                    name: 'enable',
+                    factory: IPA.batch_items_action,
+                    method: 'enable',
+                    needs_confirm: true,
+                    hide_cond: ['self-service'],
+                    enable_cond: ['item-selected']
+                }
+            ],
+            control_buttons: [
+                {
+                    name: 'disable',
+                    label: IPA.messages.buttons.disable,
+                    icon: 'disabled-icon'
+                },
+                {
+                    name: 'enable',
+                    label: IPA.messages.buttons.enable,
+                    icon: 'enabled-icon'
+                }
+            ]
         }).
         details_facet({
             factory: IPA.user.details_facet,
@@ -217,18 +219,24 @@ IPA.user.entity = function(spec) {
                     fields: [ 'carlicense' ]
                 }
             ],
-            action_list: {
-                factory: IPA.action_list_widget,
-                name: 'action',
-                state_evaluator: {
-                    factory: IPA.enable_state_evaluator,
-                    field: 'nsaccountlock',
-                    invert_value: true
-                },
-                actions: [
-                    IPA.enable_action,
-                    IPA.disable_action,
-                    IPA.delete_action
+            actions: [
+                IPA.select_action,
+                IPA.enable_action,
+                IPA.disable_action,
+                IPA.delete_action
+            ],
+            header_actions: ['select_action', 'enable', 'disable', 'delete'],
+            state: {
+                evaluators: [
+                    {
+                        factory: IPA.enable_state_evaluator,
+                        field: 'nsaccountlock',
+                        invert_value: true
+                    }
+                ],
+                summary_conditions: [
+                    IPA.enabled_summary_cond(),
+                    IPA.disabled_summary_cond()
                 ]
             }
         }).