ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject [1/2] git commit: AMBARI-7886. Admin View: attempting to create instance using same instance name fails. (akovalenko)
Date Tue, 21 Oct 2014 16:19:11 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 2fb3a48e0 -> f0a7ef07f


AMBARI-7886. Admin View: attempting to create instance using same instance name fails. (akovalenko)


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

Branch: refs/heads/branch-1.7.0
Commit: a7f1b4996383aad7890deaeaec4707b461ba9bf7
Parents: 2fb3a48
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Oct 21 18:25:09 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Oct 21 19:18:49 2014 +0300

----------------------------------------------------------------------
 .../controllers/ambariViews/CreateViewInstanceCtrl.js        | 2 +-
 .../ui/admin-web/test/unit/controllers/mainCtrl_test.js      | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7f1b499/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 76b4a7f..68421fa 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
@@ -87,7 +87,7 @@ angular.module('ambariAdminConsole')
           }
         })
         .catch(function(data) {
-          Alert.error('Cannot create instance', data.data.message);
+          Alert.error('Cannot create instance', data.message);
         });
     }
   };

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7f1b499/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
index 5117a3f..7ecd6cd 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/test/unit/controllers/mainCtrl_test.js
@@ -32,7 +32,11 @@ describe('#Auth', function () {
       clusterService =  _Cluster_;
       deferred = _$q_.defer();
       spyOn(clusterService, 'getStatus').andReturn(deferred.promise);
-      deferred.resolve('c1');
+      deferred.resolve({
+        Clusters: {
+          provisioning_state: 'INIT'
+        }
+      });
       $window = _$window_;
       $httpBackend = _$httpBackend_;
       $httpBackend.whenGET(/\/api\/v1\/logout\?_=\d+/).respond(200,{message: "successfully
logged out"});
@@ -106,4 +110,4 @@ describe('#Auth', function () {
       chai.expect(scope.viewInstances[0].instance_name).to.equal('VisibleInstance');
     });
   });
-});
\ No newline at end of file
+});


Mime
View raw message