ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made, second patch (atkach)
Date Mon, 28 Nov 2016 18:46:00 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8de17fadf -> 3c8b1582c


AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made, second
patch (atkach)


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

Branch: refs/heads/trunk
Commit: 3c8b1582c2f0aa65289b762fd0162049916e9140
Parents: 8de17fa
Author: Andrii Tkach <atkach@apache.org>
Authored: Mon Nov 28 18:36:50 2016 +0200
Committer: Andrii Tkach <atkach@apache.org>
Committed: Mon Nov 28 20:41:25 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/admin/service_auto_start.js | 2 +-
 ambari-web/app/templates/main/admin/service_auto_start.hbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/controllers/main/admin/service_auto_start.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js b/ambari-web/app/controllers/main/admin/service_auto_start.js
index 501e6bb..df07c94 100644
--- a/ambari-web/app/controllers/main/admin/service_auto_start.js
+++ b/ambari-web/app/controllers/main/admin/service_auto_start.js
@@ -208,7 +208,7 @@ App.MainAdminServiceAutoStartController = Em.Controller.extend({
         }
       }.property('enabledComponents', 'totalComponents'),
       components: Em.A([componentRecovery]),
-      enabledComponents: componentRecovery.recovery_enabled ? 1 : 0,
+      enabledComponents: componentRecovery.recoveryEnabled ? 1 : 0,
       totalComponents: 1,
       indicator: function () {
         var percentage = this.get('enabledComponents') / this.get('totalComponents');

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/templates/main/admin/service_auto_start.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index 29ec3b3..7334995 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -72,7 +72,7 @@
                   {{#each component in tab.components}}
                     <tr>
                       <td class="col-md-4">
-                        {{component.display_name}}
+                        {{component.displayName}}
                       </td>
                       <td class="col-md-8">
                         {{view App.MainAdminServiceAutoStartComponentView componentBinding="component"
tabBinding="tab"}}


Mime
View raw message