You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/03/22 13:24:16 UTC
ambari git commit: AMBARI-20521 Service quick links not showing up in
the UI. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 578e1e8f2 -> f268cccf0
AMBARI-20521 Service quick links not showing up in the UI. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f268cccf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f268cccf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f268cccf
Branch: refs/heads/branch-2.5
Commit: f268cccf0bd6ca1ac2416536612ff98484ab9e80
Parents: 578e1e8
Author: Andrii Tkach <at...@apache.org>
Authored: Wed Mar 22 13:12:15 2017 +0200
Committer: Andrii Tkach <at...@apache.org>
Committed: Wed Mar 22 13:12:29 2017 +0200
----------------------------------------------------------------------
ambari-web/app/utils/ajax/ajax.js | 13 ++++++++++---
ambari-web/test/utils/ajax/ajax_test.js | 15 ++++++++++++++-
2 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f268cccf/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index b856e44..8be3b62 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -3051,16 +3051,23 @@ var formatRequest = function (data) {
*/
var doGetAsPost = function(opt) {
var delimiterPos = opt.url.indexOf('?');
+ var fieldsIndex = opt.url.indexOf('&fields');
opt.type = "POST";
opt.headers["X-Http-Method-Override"] = "GET";
if (delimiterPos !== -1) {
+ var query = fieldsIndex !== -1 ? opt.url.substring(delimiterPos + 1, fieldsIndex) : opt.url.substr(delimiterPos + 1);
opt.data = JSON.stringify({
- "RequestInfo": {"query" : opt.url.substr(delimiterPos + 1, opt.url.length)}
+ "RequestInfo": {"query" : query}
});
- opt.url = opt.url.substr(0, delimiterPos);
+ if (fieldsIndex !== -1) {
+ opt.url = opt.url.substr(0, delimiterPos) + '?' + opt.url.substr(fieldsIndex + 1) + '&_=' + App.dateTime();
+ } else {
+ opt.url = opt.url.substr(0, delimiterPos) + '?_=' + App.dateTime();
+ }
+ } else {
+ opt.url += '?_=' + App.dateTime();
}
- opt.url += '?_=' + App.dateTime();
return opt;
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/f268cccf/ambari-web/test/utils/ajax/ajax_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/ajax/ajax_test.js b/ambari-web/test/utils/ajax/ajax_test.js
index 35de05f..485a1b4 100644
--- a/ambari-web/test/utils/ajax/ajax_test.js
+++ b/ambari-web/test/utils/ajax/ajax_test.js
@@ -153,7 +153,7 @@ describe('App.ajax', function() {
headers: {"X-Http-Method-Override": "GET"}
});
});
- it("url has '?'", function () {
+ it("url has '?params'", function () {
var opt = {
type: 'GET',
url: 'root?params',
@@ -166,6 +166,19 @@ describe('App.ajax', function() {
data: "{\"RequestInfo\":{\"query\":\"params\"}}"
});
});
+ it("url has '?params&fields'", function () {
+ var opt = {
+ type: 'GET',
+ url: 'root?params&fields',
+ headers: {}
+ };
+ expect(App.ajax.fakeDoGetAsPost({}, opt)).to.eql({
+ type: 'POST',
+ url: 'root?fields&_=1',
+ headers: {"X-Http-Method-Override": "GET"},
+ data: "{\"RequestInfo\":{\"query\":\"params\"}}"
+ });
+ });
});
describe('#abortRequests', function () {