diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-06-18 15:30:37 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-27 14:23:21 +0200 |
| commit | 9aac0524c9adb714aa63113fa6b8436e7636e8c2 (patch) | |
| tree | 15e9b285b992c46771143caacf20fc677b72e9c0 | |
| parent | 59f66a156be393dba92ab6ca999cdc39c6787c36 (diff) | |
| download | freeipa-9aac0524c9adb714aa63113fa6b8436e7636e8c2.tar.gz freeipa-9aac0524c9adb714aa63113fa6b8436e7636e8c2.tar.xz freeipa-9aac0524c9adb714aa63113fa6b8436e7636e8c2.zip | |
webui: send API version in RPC requests
Currently there is an incorrect behavior that server doesn't send datetime
and dnsname data in new format.
This patch adds the version to each RPC request making the UI look as the
latest client. Server then sends data in correct format. It also removes
the "unknown version" warning from each RPC response.
https://fedorahosted.org/freeipa/ticket/4394
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | install/ui/src/freeipa/rpc.js | 4 | ||||
| -rw-r--r-- | install/ui/src/libs/loader.js.in | 3 |
3 files changed, 7 insertions, 1 deletions
@@ -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]; |