You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/12/15 16:12:18 UTC

ambari git commit: AMBARI-8711. Admin View: default config value not being set/shown (onechiporenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 597c31733 -> bde8a5bb1


AMBARI-8711. Admin View: default config value not being set/shown (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bde8a5bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bde8a5bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bde8a5bb

Branch: refs/heads/trunk
Commit: bde8a5bb101fa34e9fe38684a0b2b8703554ed7f
Parents: 597c317
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Dec 15 16:49:53 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Dec 15 16:49:53 2014 +0200

----------------------------------------------------------------------
 .../app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js  | 2 +-
 .../ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bde8a5bb/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
index 3c04775..29a8d83 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
@@ -30,7 +30,7 @@ angular.module('ambariAdminConsole')
       var parameters = viewVersion.ViewVersionInfo.parameters;
 
       angular.forEach(parameters, function (item) {
-        item.value = item.default;
+        item.value = item['defaultValue'];
       });
 
       $scope.instance = {

http://git-wip-us.apache.org/repos/asf/ambari/blob/bde8a5bb/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
index ff54b19..cd71d11 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/CreateViewInstanceCtrl.js
@@ -37,7 +37,7 @@ describe('#CreateViewInstanceCtrl', function () {
       "versions": [{"ViewVersionInfo": {}}]
     });
     $httpBackend.whenGET(/\/api\/v1\/views\/TestView\/versions\/1\.0\.0/).respond(200, {
-      "ViewVersionInfo": {"parameters": [{"name": "n", "default": "d"}]}
+      "ViewVersionInfo": {"parameters": [{"name": "n", "defaultValue": "d"}]}
     });
     $httpBackend.whenGET('template/modal/backdrop.html').respond(200, '<div></div>');
     $httpBackend.whenGET('template/modal/window.html').respond(200, '<div></div>');