summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--install/ui/src/freeipa/rpc.js4
-rw-r--r--install/ui/src/libs/loader.js.in3
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0d0e641c9..e8f80a688 100644
--- a/Makefile
+++ b/Makefile
@@ -136,6 +136,7 @@ version-update: release-update
> ipatests/setup.py
sed -e s/__NUM_VERSION__/$(IPA_NUM_VERSION)/ install/ui/src/libs/loader.js.in \
> install/ui/src/libs/loader.js
+ perl -pi -e "s:__API_VERSION__:$(IPA_API_VERSION_MAJOR).$(IPA_API_VERSION_MINOR):" install/ui/src/libs/loader.js
perl -pi -e "s:__NUM_VERSION__:$(IPA_NUM_VERSION):" ipapython/version.py
perl -pi -e "s:__VENDOR_VERSION__:$(IPA_VENDOR_VERSION):" ipapython/version.py
perl -pi -e "s:__API_VERSION__:$(IPA_API_VERSION_MAJOR).$(IPA_API_VERSION_MINOR):" ipapython/version.py
diff --git a/install/ui/src/freeipa/rpc.js b/install/ui/src/freeipa/rpc.js
index 981b0c783..d49f60fee 100644
--- a/install/ui/src/freeipa/rpc.js
+++ b/install/ui/src/freeipa/rpc.js
@@ -362,6 +362,8 @@ rpc.command = function(spec) {
}
}
+ that.options.version = window.ipa_loader.api_version;
+
that.data = {
method: that.get_command(),
params: [that.args, that.options]
@@ -512,6 +514,8 @@ rpc.batch_command = function(spec) {
that.execute = function() {
that.errors.clear();
+ that.options.version = window.ipa_loader.api_version;
+
var command = rpc.command({
name: that.name,
entity: that.entity,
diff --git a/install/ui/src/libs/loader.js.in b/install/ui/src/libs/loader.js.in
index f33989ead..6a50f327d 100644
--- a/install/ui/src/libs/loader.js.in
+++ b/install/ui/src/libs/loader.js.in
@@ -20,7 +20,8 @@
(function() {
var loader = window.ipa_loader = {
- num_version: '__NUM_VERSION__'
+ num_version: '__NUM_VERSION__',
+ api_version: '__API_VERSION__'
};
var head = document.getElementsByTagName('head')[0];