Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4946818E9F for ; Tue, 23 Jun 2015 17:02:35 +0000 (UTC) Received: (qmail 41839 invoked by uid 500); 23 Jun 2015 17:02:35 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 41762 invoked by uid 500); 23 Jun 2015 17:02:35 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 41746 invoked by uid 99); 23 Jun 2015 17:02:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jun 2015 17:02:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3B90E02A2; Tue, 23 Jun 2015 17:02:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ababiichuk@apache.org To: commits@ambari.apache.org Date: Tue, 23 Jun 2015 17:02:34 -0000 Message-Id: <2b108bc123004ed7941b45e60e935726@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-12095 Configs: version box (and hover) showing stack, then disappears. (ababiichuk) Repository: ambari Updated Branches: refs/heads/branch-2.1 550470fbc -> 62d1373de AMBARI-12095 Configs: version box (and hover) showing stack, then disappears. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7898076f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7898076f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7898076f Branch: refs/heads/branch-2.1 Commit: 7898076f71eab033aea1c51f98856b06eaf68121 Parents: 550470f Author: aBabiichuk Authored: Tue Jun 23 19:38:43 2015 +0300 Committer: aBabiichuk Committed: Tue Jun 23 20:01:13 2015 +0300 ---------------------------------------------------------------------- .../controllers/main/dashboard/config_history_controller.js | 2 +- .../main/dashboard/config_history_controller_test.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7898076f/ambari-web/app/controllers/main/dashboard/config_history_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/dashboard/config_history_controller.js b/ambari-web/app/controllers/main/dashboard/config_history_controller.js index 2d58d95..a2e6f52 100644 --- a/ambari-web/app/controllers/main/dashboard/config_history_controller.js +++ b/ambari-web/app/controllers/main/dashboard/config_history_controller.js @@ -32,7 +32,7 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin resetStartIndex: true, mockUrl: '/data/configurations/service_versions.json', realUrl: function () { - return App.apiPrefix + '/clusters/' + App.get('clusterName') + '/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true'; + return App.apiPrefix + '/clusters/' + App.get('clusterName') + '/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true'; }.property('App.clusterName'), /** http://git-wip-us.apache.org/repos/asf/ambari/blob/7898076f/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js b/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js index 68e99c1..a1bc7af 100644 --- a/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js +++ b/ambari-web/test/controllers/main/dashboard/config_history_controller_test.js @@ -28,11 +28,11 @@ describe('MainConfigHistoryController', function () { describe('#realUrl', function () { it('cluster name is empty', function () { App.set('clusterName', ''); - expect(controller.get('realUrl')).to.equal('/api/v1/clusters//configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true'); + expect(controller.get('realUrl')).to.equal('/api/v1/clusters//configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true'); }); it('cluster name is "mycluster"', function () { App.set('clusterName', 'mycluster'); - expect(controller.get('realUrl')).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true'); + expect(controller.get('realUrl')).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true'); }); }); describe('#load()', function () { @@ -110,14 +110,14 @@ describe('MainConfigHistoryController', function () { if ('testMode' === k) return false; return Em.get(App, k); }); - expect(controller.getUrl()).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true'); + expect(controller.getUrl()).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true'); }); it('query params is correct', function () { sinon.stub(App, 'get', function(k) { if ('testMode' === k) return false; return Em.get(App, k); }); - expect(controller.getUrl({})).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?params&fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible&minimal_response=true'); + expect(controller.getUrl({})).to.equal('/api/v1/clusters/mycluster/configurations/service_config_versions?params&fields=service_config_version,user,group_id,group_name,is_current,createtime,service_name,hosts,service_config_version_note,is_cluster_compatible,stack_id&minimal_response=true'); }); });