ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject [39/51] [abbrv] ambari git commit: AMBARI-15333. Host check warning for User Issues shows incorrect message (alexantonenko)
Date Wed, 09 Mar 2016 23:50:31 GMT
AMBARI-15333. Host check warning for User Issues shows incorrect message (alexantonenko)


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

Branch: refs/heads/AMBARI-13364
Commit: eb6b0da8eb11b14b053c822a6de147e0af6b9d8a
Parents: 28430f3
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Wed Mar 9 21:08:39 2016 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Wed Mar 9 21:09:28 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step3_controller.js | 12 ++++++------
 ambari-web/test/controllers/wizard/step3_test.js      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b0da8/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index 19ddd20..8e8eb11 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -1222,14 +1222,14 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin,
{
       var existingUsers = lastAgentEnvCheck.existingUsers;
       if (existingUsers) {
         existingUsers.forEach(function (user) {
-          warning = warningCategories.usersWarnings[user.userName];
+          warning = warningCategories.usersWarnings[user.name];
           if (warning) {
             warning.hosts.push(hostName);
             warning.hostsLong.push(hostName);
             warning.onSingleHost = false;
           } else {
-            warningCategories.usersWarnings[user.userName] = warning = {
-              name: user.userName,
+            warningCategories.usersWarnings[user.name] = warning = {
+              name: user.name,
               hosts: [hostName],
               hostsLong: [hostName],
               category: 'users',
@@ -1902,14 +1902,14 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin,
{
       //todo: to be removed after check in new API
       if (_host.Hosts.last_agent_env.existingUsers) {
         _host.Hosts.last_agent_env.existingUsers.forEach(function (user) {
-          warning = warningCategories.usersWarnings[user.userName];
+          warning = warningCategories.usersWarnings[user.name];
           if (warning) {
             warning.hosts.push(_host.Hosts.host_name);
             warning.hostsLong.push(_host.Hosts.host_name);
             warning.onSingleHost = false;
           } else {
-            warningCategories.usersWarnings[user.userName] = warning = {
-              name: user.userName,
+            warningCategories.usersWarnings[user.name] = warning = {
+              name: user.name,
               hosts: [_host.Hosts.host_name],
               hostsLong: [_host.Hosts.host_name],
               category: 'users',

http://git-wip-us.apache.org/repos/asf/ambari/blob/eb6b0da8/ambari-web/test/controllers/wizard/step3_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step3_test.js b/ambari-web/test/controllers/wizard/step3_test.js
index dbfb868..6cb7ee7 100644
--- a/ambari-web/test/controllers/wizard/step3_test.js
+++ b/ambari-web/test/controllers/wizard/step3_test.js
@@ -1425,7 +1425,7 @@ describe('App.WizardStep3Controller', function () {
             {
               tasks: [
                 {Tasks: {host_name: 'c1',
-                         structured_out: {last_agent_env_check: {existingUsers: [{userName:
'n1'}]}}
+                         structured_out: {last_agent_env_check: {existingUsers: [{name: 'n1'}]}}
                         }
                 }
               ],
@@ -1445,11 +1445,11 @@ describe('App.WizardStep3Controller', function () {
             {
               tasks: [
                 {Tasks: {host_name: 'c1',
-                         structured_out:{last_agent_env_check: {existingUsers: [{userName:
'n1'}]}}
+                         structured_out:{last_agent_env_check: {existingUsers: [{name: 'n1'}]}}
                         }
                 },
                 {Tasks: {host_name: 'c2',
-                         structured_out:{last_agent_env_check: {existingUsers: [{userName:
'n1'}]}}
+                         structured_out:{last_agent_env_check: {existingUsers: [{name: 'n1'}]}}
                         }
                 }
               ],
@@ -1910,7 +1910,7 @@ describe('App.WizardStep3Controller', function () {
             {
               items: [
                 {Hosts: {host_name: 'c1', last_agent_env: {existingUsers: [
-                  {userName: 'n1'}
+                  {name: 'n1'}
                 ]}}}
               ],
               m: 'not empty existingUsers',
@@ -1929,10 +1929,10 @@ describe('App.WizardStep3Controller', function () {
             {
               items: [
                 {Hosts: {host_name: 'c1', last_agent_env: {existingUsers: [
-                  {userName: 'n1'}
+                  {name: 'n1'}
                 ]}}},
                 {Hosts: {host_name: 'c2', last_agent_env: {existingUsers: [
-                  {userName: 'n1'}
+                  {name: 'n1'}
                 ]}}}
               ],
               m: 'not empty existingUsers on two hosts',


Mime
View raw message