From 60b3208cf5cad06ee9578416657c4bf626b9f336 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Wed, 17 Apr 2013 16:59:42 +0200 Subject: Replace IPA.get_entity_param calls in specs with provider strings https://fedorahosted.org/freeipa/ticket/3235 --- install/ui/src/freeipa/automount.js | 2 +- install/ui/src/freeipa/dns.js | 5 ++--- install/ui/src/freeipa/idrange.js | 20 ++++++++++---------- install/ui/src/freeipa/user.js | 22 +++++++++++----------- 4 files changed, 24 insertions(+), 25 deletions(-) (limited to 'install') diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js index 10d97368a..389bb7aef 100644 --- a/install/ui/src/freeipa/automount.js +++ b/install/ui/src/freeipa/automount.js @@ -81,7 +81,7 @@ IPA.automount.map_entity = function(spec) { { $factory: IPA.automount_key_column, name: 'automountkey', - label: IPA.get_entity_param('automountkey', 'automountkey').label + label: '@mo-param:automountkey:automountkey:label' }, 'automountinformation' ] diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 0347b9ff1..503cb129f 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -272,7 +272,7 @@ IPA.dns.zone_entity = function(spec) { columns: [ { name: 'idnsname', - label: IPA.get_entity_param('dnsrecord', 'idnsname').label, + label: '@mo-param:dnsrecord:idnsname:label', primary_key: true }, { @@ -1177,8 +1177,7 @@ IPA.dns.record_entity = function(spec) { $type: 'dnsrecord_host_link', name: 'idnsname', other_entity: 'host', - label: IPA.get_entity_param( - 'dnsrecord', 'idnsname').label + label: '@mo-param:dnsrecord:idnsname:label' } ] } diff --git a/install/ui/src/freeipa/idrange.js b/install/ui/src/freeipa/idrange.js index 7598e4fff..f7e195a24 100644 --- a/install/ui/src/freeipa/idrange.js +++ b/install/ui/src/freeipa/idrange.js @@ -48,27 +48,27 @@ IPA.idrange.entity = function(spec) { { name: 'ipabaseid', label: '@i18n:objects.idrange.ipabaseid', - tooltip: IPA.get_entity_param('idrange', 'ipabaseid').label + tooltip: '@mo-param:idrange:ipabaseid:label' }, { name: 'ipaidrangesize', label: '@i18n:objects.idrange.ipaidrangesize', - tooltip: IPA.get_entity_param('idrange', 'ipaidrangesize').label + tooltip: '@mo-param:idrange:ipaidrangesize:label' }, { name: 'ipabaserid', label: '@i18n:objects.idrange.ipabaserid', - tooltip: IPA.get_entity_param('idrange', 'ipabaserid').label + tooltip: '@mo-param:idrange:ipabaserid:label' }, { name: 'ipasecondarybaserid', label: '@i18n:objects.idrange.ipasecondarybaserid', - tooltip: IPA.get_entity_param('idrange', 'ipasecondarybaserid').label + tooltip: '@mo-param:idrange:ipasecondarybaserid:label' }, { name: 'ipanttrusteddomainsid', label: '@i18n:objects.idrange.ipanttrusteddomainsid', - tooltip: IPA.get_entity_param('idrange', 'ipanttrusteddomainsid').label + tooltip: '@mo-param:idrange:ipanttrusteddomainsid:label' } ] } @@ -83,31 +83,31 @@ IPA.idrange.entity = function(spec) { { name: 'ipabaseid', label: '@i18n:objects.idrange.ipabaseid', - tooltip: IPA.get_entity_param('idrange', 'ipabaseid').label, + tooltip: '@mo-param:idrange:ipabaseid:label', widget: 'idrange.ipabaseid' }, { name: 'ipaidrangesize', label: '@i18n:objects.idrange.ipaidrangesize', - tooltip: IPA.get_entity_param('idrange', 'ipaidrangesize').label, + tooltip: '@mo-param:idrange:ipaidrangesize:label', widget: 'idrange.ipaidrangesize' }, { name: 'ipabaserid', label: '@i18n:objects.idrange.ipabaserid', - tooltip: IPA.get_entity_param('idrange', 'ipabaserid').label, + tooltip: '@mo-param:idrange:ipabaserid:label', widget: 'idrange.ipabaserid' }, { name: 'ipasecondarybaserid', label: '@i18n:objects.idrange.ipasecondarybaserid', - tooltip: IPA.get_entity_param('idrange', 'ipasecondarybaserid').label, + tooltip: '@mo-param:idrange:ipasecondarybaserid:label', widget: 'type.ipasecondarybaserid' }, { name: 'ipanttrusteddomainsid', label: '@i18n:objects.idrange.ipanttrusteddomainsid', - tooltip: IPA.get_entity_param('idrange', 'ipanttrusteddomainsid').label, + tooltip: '@mo-param:idrange:ipanttrusteddomainsid:label', widget: 'type.ipanttrusteddomainsid' } ], diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index 8b09d16f3..fe2ea683f 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -116,7 +116,7 @@ IPA.user.entity = function(spec) { { $factory: IPA.user_password_widget, name: 'has_password', - metadata: IPA.get_entity_param('user', 'userpassword') + metadata: '@mo-param:user:userpassword' }, { name: 'krbpasswordexpiration', @@ -141,44 +141,44 @@ IPA.user.entity = function(spec) { fields: [ { name: 'krbmaxpwdlife', - label: IPA.get_entity_param('pwpolicy', 'krbmaxpwdlife').label, + label: '@mo-param:pwpolicy:krbmaxpwdlife:label', read_only: true }, { name: 'krbminpwdlife', - label: IPA.get_entity_param('pwpolicy', 'krbminpwdlife').label, + label: '@mo-param:pwpolicy:krbminpwdlife:label', read_only: true }, { name: 'krbpwdhistorylength', - label: IPA.get_entity_param('pwpolicy', 'krbpwdhistorylength').label, + label: '@mo-param:pwpolicy:krbpwdhistorylength:label', read_only: true, measurement_unit: 'number_of_passwords' }, { name: 'krbpwdmindiffchars', - label: IPA.get_entity_param('pwpolicy', 'krbpwdmindiffchars').label, + label: '@mo-param:pwpolicy:krbpwdmindiffchars:label', read_only: true }, { name: 'krbpwdminlength', - label: IPA.get_entity_param('pwpolicy', 'krbpwdminlength').label, + label: '@mo-param:pwpolicy:krbpwdminlength:label', read_only: true }, { name: 'krbpwdmaxfailure', - label: IPA.get_entity_param('pwpolicy', 'krbpwdmaxfailure').label, + label: '@mo-param:pwpolicy:krbpwdmaxfailure:label', read_only: true }, { name: 'krbpwdfailurecountinterval', - label: IPA.get_entity_param('pwpolicy', 'krbpwdfailurecountinterval').label, + label: '@mo-param:pwpolicy:krbpwdfailurecountinterval:label', read_only: true, measurement_unit: 'seconds' }, { name: 'krbpwdlockoutduration', - label: IPA.get_entity_param('pwpolicy', 'krbpwdlockoutduration').label, + label: '@mo-param:pwpolicy:krbpwdlockoutduration:label', read_only: true, measurement_unit: 'seconds' } @@ -190,13 +190,13 @@ IPA.user.entity = function(spec) { fields: [ { name: 'krbmaxrenewableage', - label: IPA.get_entity_param('krbtpolicy', 'krbmaxrenewableage').label, + label: '@mo-param:krbtpolicy:krbmaxrenewableage:label', read_only: true, measurement_unit: 'seconds' }, { name: 'krbmaxticketlife', - label: IPA.get_entity_param('krbtpolicy', 'krbmaxticketlife').label, + label: '@mo-param:krbtpolicy:krbmaxticketlife:label', read_only: true, measurement_unit: 'seconds' } -- cgit