summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-04-17 11:07:37 +0200
committerPetr Vobornik <pvoborni@redhat.com>2013-05-06 16:22:27 +0200
commit7a3f08002dc44c1dafce461a249eacc435725871 (patch)
treea6ffe598832e94fc3e4e7f48e994841f858f14d9
parent5be709bf9d4865486c239584653363c1d85492a6 (diff)
downloadfreeipa-7a3f08002dc44c1dafce461a249eacc435725871.tar.gz
freeipa-7a3f08002dc44c1dafce461a249eacc435725871.tar.xz
freeipa-7a3f08002dc44c1dafce461a249eacc435725871.zip
Replace usage of action factories with types
https://fedorahosted.org/freeipa/ticket/3235
-rw-r--r--install/ui/src/freeipa/association.js4
-rwxr-xr-xinstall/ui/src/freeipa/certificate.js4
-rw-r--r--install/ui/src/freeipa/details.js6
-rw-r--r--install/ui/src/freeipa/dns.js16
-rw-r--r--install/ui/src/freeipa/group.js8
-rw-r--r--install/ui/src/freeipa/hbac.js12
-rw-r--r--install/ui/src/freeipa/host.js16
-rw-r--r--install/ui/src/freeipa/search.js6
-rw-r--r--install/ui/src/freeipa/selinux.js12
-rw-r--r--install/ui/src/freeipa/service.js12
-rw-r--r--install/ui/src/freeipa/sudo.js12
-rw-r--r--install/ui/src/freeipa/user.js14
12 files changed, 61 insertions, 61 deletions
diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js
index f23568c48..d3a2d3220 100644
--- a/install/ui/src/freeipa/association.js
+++ b/install/ui/src/freeipa/association.js
@@ -766,7 +766,7 @@ IPA.association_facet = function (spec, no_init) {
//default buttons and their actions
spec.actions = spec.actions || [];
spec.actions.unshift(
- IPA.refresh_action,
+ 'refresh',
{
name: 'remove',
hide_cond: ['read-only'],
@@ -1151,7 +1151,7 @@ IPA.attribute_facet = function(spec, no_init) {
//default buttons and their actions
spec.actions = spec.actions || [];
spec.actions.unshift(
- IPA.refresh_action,
+ 'refresh',
{
name: 'remove',
hide_cond: ['read-only'],
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index 712d82c91..4553a6a29 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -1130,8 +1130,8 @@ IPA.cert.entity = function(spec) {
$factory: IPA.cert.details_facet,
no_update: true,
actions: [
- IPA.cert.revoke_action,
- IPA.cert.restore_action
+ 'cert_revoke',
+ 'cert_restore'
],
state: {
evaluators: [
diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js
index 7a7f49e4f..8c6332e1b 100644
--- a/install/ui/src/freeipa/details.js
+++ b/install/ui/src/freeipa/details.js
@@ -244,9 +244,9 @@ exp.details_facet = IPA.details_facet = function(spec, no_init) {
spec.actions = spec.actions || [];
spec.actions.unshift(
- IPA.refresh_action,
- IPA.reset_action,
- IPA.update_action);
+ 'refresh',
+ 'reset',
+ 'update');
spec.control_buttons = spec.control_buttons || [];
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index 265251ad0..4ee17ebb0 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -129,8 +129,8 @@ IPA.dns.zone_entity = function(spec) {
}
],
actions: [
- IPA.batch_disable_action,
- IPA.batch_enable_action
+ 'batch_disable',
+ 'batch_enable'
],
control_buttons: [
{
@@ -233,12 +233,12 @@ IPA.dns.zone_entity = function(spec) {
]
}],
actions: [
- IPA.select_action,
- IPA.enable_action,
- IPA.disable_action,
- IPA.delete_action,
- IPA.dns.add_permission_action,
- IPA.dns.remove_permission_action
+ 'select',
+ 'enable',
+ 'disable',
+ 'delete',
+ 'dns_add_permission',
+ 'dns_remove_permission'
],
header_actions: ['select_action', 'enable', 'disable', 'delete',
'add_permission', 'remove_permission'],
diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
index 34aa02f33..85663886d 100644
--- a/install/ui/src/freeipa/group.js
+++ b/install/ui/src/freeipa/group.js
@@ -73,10 +73,10 @@ IPA.group.entity = function(spec) {
}
],
actions: [
- IPA.select_action,
- IPA.group.make_posix_action,
- IPA.group.make_external_action,
- IPA.delete_action
+ 'select',
+ 'make_posix',
+ 'make_external',
+ 'delete'
],
header_actions: ['select_action', 'make_posix', 'make_external', 'delete'],
state: {
diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js
index 70d072a41..502d005b4 100644
--- a/install/ui/src/freeipa/hbac.js
+++ b/install/ui/src/freeipa/hbac.js
@@ -47,8 +47,8 @@ IPA.hbac.rule_entity = function(spec) {
'description'
],
actions: [
- IPA.batch_disable_action,
- IPA.batch_enable_action
+ 'batch_disable',
+ 'batch_enable'
],
control_buttons: [
{
@@ -68,10 +68,10 @@ IPA.hbac.rule_entity = function(spec) {
entity: that,
command_mode: 'info',
actions: [
- IPA.select_action,
- IPA.enable_action,
- IPA.disable_action,
- IPA.delete_action
+ 'select',
+ 'enable',
+ 'disable',
+ 'delete'
],
header_actions: ['select_action', 'enable', 'disable', 'delete'],
state: {
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index 9d0215590..cfa282673 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -145,26 +145,26 @@ IPA.host.entity = function(spec) {
}
],
actions: [
- IPA.host.unprovision_action,
+ 'host_unprovision',
{
- $factory: IPA.host.set_otp_action,
+ $type: 'set_otp',
name: 'set_otp',
label: '@i18n:objects.host.password_set_title',
status: 'missing',
hide_cond: ['has_password']
},
{
- $factory: IPA.host.set_otp_action,
+ $type: 'set_otp',
name: 'reset_otp',
label: '@i18n:objects.host.password_reset_title',
status: 'present',
show_cond: ['has_password']
},
- IPA.cert.view_action,
- IPA.cert.get_action,
- IPA.cert.request_action,
- IPA.cert.revoke_action,
- IPA.cert.restore_action
+ 'cert_view',
+ 'cert_get',
+ 'cert_request',
+ 'cert_revoke',
+ 'cert_restore'
],
state: {
evaluators: [
diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js
index fafbc3b21..8af5a29d3 100644
--- a/install/ui/src/freeipa/search.js
+++ b/install/ui/src/freeipa/search.js
@@ -46,9 +46,9 @@ IPA.search_facet = function(spec, no_init) {
spec.actions = spec.actions || [];
spec.actions.unshift(
- IPA.refresh_action,
- IPA.batch_remove_action,
- IPA.add_action);
+ 'refresh',
+ 'batch_remove',
+ 'add');
spec.control_buttons = spec.control_buttons || [];
diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js
index 9fac27b04..3ecf004e5 100644
--- a/install/ui/src/freeipa/selinux.js
+++ b/install/ui/src/freeipa/selinux.js
@@ -46,8 +46,8 @@ IPA.selinux.selinuxusermap_entity = function(spec) {
'description'
],
actions: [
- IPA.batch_disable_action,
- IPA.batch_enable_action
+ 'batch_disable',
+ 'batch_enable'
],
control_buttons: [
{
@@ -67,10 +67,10 @@ IPA.selinux.selinuxusermap_entity = function(spec) {
entity: that,
command_mode: 'info',
actions: [
- IPA.select_action,
- IPA.enable_action,
- IPA.disable_action,
- IPA.delete_action
+ 'select',
+ 'enable',
+ 'disable',
+ 'delete'
],
header_actions: ['select_action', 'enable', 'disable', 'delete'],
state: {
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index f51b85532..5dc69aaa9 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -149,12 +149,12 @@ IPA.service.entity = function(spec) {
}
],
actions: [
- IPA.service.unprovision_action,
- IPA.cert.view_action,
- IPA.cert.get_action,
- IPA.cert.request_action,
- IPA.cert.revoke_action,
- IPA.cert.restore_action
+ 'service_unprovision',
+ 'cert_view',
+ 'cert_get',
+ 'cert_request',
+ 'cert_revoke',
+ 'cert_restore'
],
state: {
evaluators: [
diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js
index b940cf8f7..05b75d901 100644
--- a/install/ui/src/freeipa/sudo.js
+++ b/install/ui/src/freeipa/sudo.js
@@ -45,8 +45,8 @@ IPA.sudo.rule_entity = function(spec) {
'description'
],
actions: [
- IPA.batch_disable_action,
- IPA.batch_enable_action
+ 'batch_disable',
+ 'batch_enable'
],
control_buttons: [
{
@@ -66,10 +66,10 @@ IPA.sudo.rule_entity = function(spec) {
entity: that,
command_mode: 'info',
actions: [
- IPA.select_action,
- IPA.enable_action,
- IPA.disable_action,
- IPA.delete_action
+ 'select',
+ 'enable',
+ 'disable',
+ 'delete'
],
header_actions: ['select_action', 'enable', 'disable', 'delete'],
state: {
diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js
index bc608d8a8..422377894 100644
--- a/install/ui/src/freeipa/user.js
+++ b/install/ui/src/freeipa/user.js
@@ -67,11 +67,11 @@ IPA.user.entity = function(spec) {
],
actions: [
{
- $factory: IPA.batch_disable_action,
+ $type: 'batch_disable',
hide_cond: ['self-service']
},
{
- $factory: IPA.batch_enable_action,
+ $type: 'batch_enable',
hide_cond: ['self-service']
}
],
@@ -234,11 +234,11 @@ IPA.user.entity = function(spec) {
}
],
actions: [
- IPA.select_action,
- IPA.enable_action,
- IPA.disable_action,
- IPA.delete_action,
- IPA.user.reset_password_action
+ 'select',
+ 'enable',
+ 'disable',
+ 'delete',
+ 'reset_password'
],
header_actions: ['select_action', 'enable', 'disable', 'delete'],
state: {