summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2016-01-20 19:00:33 +0100
committerPetr Vobornik <pvoborni@redhat.com>2016-02-23 10:13:26 +0100
commit31f42bc2e1e931b4c7dec9bf89eb94c844397ea2 (patch)
treeae27943c8164a0db94ff69ab971e41386734f5e9 /install
parenta3f8e8e71f95c145cbf2e1917bd71c6bedee11d4 (diff)
downloadfreeipa-31f42bc2e1e931b4c7dec9bf89eb94c844397ea2.tar.gz
freeipa-31f42bc2e1e931b4c7dec9bf89eb94c844397ea2.tar.xz
freeipa-31f42bc2e1e931b4c7dec9bf89eb94c844397ea2.zip
webui: use API call ca_is_enabled instead of enable_ra env variable.
To be consistent with backend code. https://fedorahosted.org/freeipa/ticket/5622 Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
Diffstat (limited to 'install')
-rwxr-xr-xinstall/ui/src/freeipa/certificate.js2
-rw-r--r--install/ui/src/freeipa/ipa.js8
-rw-r--r--install/ui/test/data/ipa_init.json6
3 files changed, 15 insertions, 1 deletions
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index aaae4d9fb..ae05ebb3d 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -612,7 +612,7 @@ IPA.cert.load_policy = function(spec) {
};
IPA.cert.is_enabled = function() {
- return !!IPA.env.enable_ra;
+ return !!IPA.ca_enabled;
};
IPA.cert.view_action = function(spec) {
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 23efd6916..29af40487 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -232,6 +232,14 @@ var IPA = function () {
}
}));
+ batch.add_command(rpc.command({
+ entity: 'ca',
+ method: 'is_enabled',
+ on_success: function(data, text_status, xhr) {
+ that.ca_enabled = data.result;
+ }
+ }));
+
batch.execute();
};
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index b25fa9357..852b95373 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -975,6 +975,12 @@
{
"error": null,
"result": 1
+ },
+ {
+ "error": null,
+ "result": true,
+ "summary": null,
+ "value": null
}
]
}