From 511452ec41d7427fd284233ac39a50072d0ece55 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Tue, 16 Apr 2013 14:29:41 +0200 Subject: Replace formatter creation with definition in specs https://fedorahosted.org/freeipa/ticket/3235 --- install/ui/src/freeipa/dns.js | 2 +- install/ui/src/freeipa/hbac.js | 2 +- install/ui/src/freeipa/hbactest.js | 13 +++++++------ install/ui/src/freeipa/host.js | 2 +- install/ui/src/freeipa/netgroup.js | 2 +- install/ui/src/freeipa/rule.js | 2 +- install/ui/src/freeipa/selinux.js | 2 +- install/ui/src/freeipa/sudo.js | 2 +- install/ui/src/freeipa/user.js | 7 ++++--- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index ee78acf09..ced1e3cdc 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -125,7 +125,7 @@ IPA.dns.zone_entity = function(spec) { { name: 'idnszoneactive', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter() + formatter: 'boolean_status' } ], actions: [ diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js index d59f96d09..70d072a41 100644 --- a/install/ui/src/freeipa/hbac.js +++ b/install/ui/src/freeipa/hbac.js @@ -42,7 +42,7 @@ IPA.hbac.rule_entity = function(spec) { { name: 'ipaenabledflag', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter() + formatter: 'boolean_status' }, 'description' ], diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js index 3b0796056..35a5c3a1f 100644 --- a/install/ui/src/freeipa/hbactest.js +++ b/install/ui/src/freeipa/hbactest.js @@ -50,9 +50,10 @@ IPA.hbac.test_entity = function(spec) { { name: 'nsaccountlock', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter({ + formatter: { + $type: 'boolean_status', invert_value: true - }) + } } ] }). @@ -69,7 +70,7 @@ IPA.hbac.test_entity = function(spec) { { name: 'has_keytab', label: '@i18n:objects.host.enrolled', - formatter: IPA.boolean_formatter() + formatter: 'boolean' } ] }). @@ -98,7 +99,7 @@ IPA.hbac.test_entity = function(spec) { { name: 'ipaenabledflag', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter() + formatter: 'boolean_status' }, 'description' ] @@ -116,12 +117,12 @@ IPA.hbac.test_entity = function(spec) { { name: 'matched', label: '@i18n:objects.hbactest.matched', - formatter: IPA.boolean_formatter() + formatter: 'boolean' }, { name: 'ipaenabledflag', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter() + formatter: 'boolean_status' }, 'description' ] diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js index e7d3920ec..0cb7f5ab0 100644 --- a/install/ui/src/freeipa/host.js +++ b/install/ui/src/freeipa/host.js @@ -64,7 +64,7 @@ IPA.host.entity = function(spec) { { name: 'has_keytab', label: '@i18n:objects.host.enrolled', - formatter: IPA.boolean_formatter() + formatter: 'boolean' } ] }). diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js index 2a6378777..7c7bb9b8d 100644 --- a/install/ui/src/freeipa/netgroup.js +++ b/install/ui/src/freeipa/netgroup.js @@ -260,7 +260,7 @@ IPA.netgroup.details_facet = function(spec) { { name: 'externalhost', label: '@i18n:objects.netgroup.external', - formatter: IPA.boolean_formatter(), + formatter: 'boolean', width: '200px' } ] diff --git a/install/ui/src/freeipa/rule.js b/install/ui/src/freeipa/rule.js index 194b443d6..11ceab934 100644 --- a/install/ui/src/freeipa/rule.js +++ b/install/ui/src/freeipa/rule.js @@ -130,7 +130,7 @@ IPA.rule_association_table_widget = function(spec) { name: that.external, label: '@i18n:objects.sudorule.external', entity: that.other_entity, - formatter: IPA.boolean_formatter(), + formatter: 'boolean', width: '200px' }); } diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js index f6af458eb..9fac27b04 100644 --- a/install/ui/src/freeipa/selinux.js +++ b/install/ui/src/freeipa/selinux.js @@ -41,7 +41,7 @@ IPA.selinux.selinuxusermap_entity = function(spec) { { name: 'ipaenabledflag', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter() + formatter: 'boolean_status' }, 'description' ], diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index 6df1cc2b6..b940cf8f7 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -40,7 +40,7 @@ IPA.sudo.rule_entity = function(spec) { { name: 'ipaenabledflag', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter() + formatter: 'boolean_status' }, 'description' ], diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index 4fd4a7804..6d9c0c2d1 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -45,9 +45,10 @@ IPA.user.entity = function(spec) { { name: 'nsaccountlock', label: '@i18n:status.label', - formatter: IPA.boolean_status_formatter({ + formatter: { + $type: 'boolean_status', invert_value: true - }) + } }, 'uidnumber', 'mail', @@ -111,7 +112,7 @@ IPA.user.entity = function(spec) { name: 'krbpasswordexpiration', label: '@i18n:objects.user.krbpasswordexpiration', read_only: true, - formatter: IPA.utc_date_formatter() + formatter: 'utc_date' }, 'uidnumber', 'gidnumber', -- cgit