From 31f42bc2e1e931b4c7dec9bf89eb94c844397ea2 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Wed, 20 Jan 2016 19:00:33 +0100 Subject: [PATCH] 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 --- install/ui/src/freeipa/certificate.js | 2 +- install/ui/src/freeipa/ipa.js | 8 ++++++++ install/ui/test/data/ipa_init.json | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) 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 } ] }