ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [2/2] ambari git commit: AMBARI-11802. Configs: dependent configs dialog issues (alexantonenko)
Date Tue, 09 Jun 2015 19:59:58 GMT
AMBARI-11802. Configs: dependent configs dialog issues (alexantonenko)


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

Branch: refs/heads/trunk
Commit: a44784f0d0fb291987fe545c29bdb054bd9b7d4b
Parents: 721f8a3
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Tue Jun 9 19:37:05 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Jun 9 22:59:02 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/messages.js                                   | 7 ++++---
 .../templates/common/modal_popups/dependent_configs_list.hbs | 4 ++--
 .../common/modal_popups/dependent_configs_list_popup.js      | 8 ++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a44784f0/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index fa3d2e5..88c716d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -253,7 +253,7 @@ Em.I18n.translations = {
   'common.stdout': "stdout",
   'common.stderr': "stderr",
   'common.structuredOut': "structured_out",
-  'common.fileName': 'File name',
+  'common.fileName': 'File Name',
   'common.days': "Days",
   'common.hours': "Hours",
   'common.minutes': "Minutes",
@@ -360,10 +360,11 @@ Em.I18n.translations = {
   'popup.invalid.KDC.admin.password': 'Admin password',
 
   'popup.dependent.configs.header': 'Dependent Configurations',
-  'popup.dependent.configs.title': 'Configurations depending on changes made are show below.
It is recommended to update these values. Properties that are not selected have user supplied
value different than the recommendation',
+  'popup.dependent.configs.title': 'Based on your configuration changes, Ambari is recommending
the following dependent configuration changes. <br/> Ambari will update all checked
configuration changes to the <b>Recommended Value</b>. Uncheck any configuration
to retain the <b>Current Value</b>.',
   'popup.dependent.configs.table.saveProperty': 'Save property',
   'popup.dependent.configs.table.initValue': 'Initial value',
-  'popup.dependent.configs.table.recommendedValue': 'Recommended value',
+  'popup.dependent.configs.table.currentValue': 'Current Value',
+  'popup.dependent.configs.table.recommendedValue': 'Recommended Value',
 
   'popup.dependent.configs.select.config.group.header': 'Select Config Group',
   'popup.dependent.configs.select.config.group': 'Please select to which config group would
you like to save dependent properties',

http://git-wip-us.apache.org/repos/asf/ambari/blob/a44784f0/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
index ba3b240..b5a8220 100644
--- a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
+++ b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
@@ -23,12 +23,12 @@
   <table class="table table-striped">
     <thead>
     <tr>
-      <th class="check-box-col">{{view view.ToggleAll}}</th>
+      <th class="check-box-col">{{view view.toggleAll}}</th>
       <th>{{t common.property}}</th>
       <th>{{t common.service}}</th>
       <th>{{t common.configGroup}}</th>
       <th>{{t common.fileName}}</th>
-      <th>{{t popup.dependent.configs.table.initValue}}</th>
+      <th>{{t popup.dependent.configs.table.currentValue}}</th>
       <th>{{t popup.dependent.configs.table.recommendedValue}}</th>
     </tr>
     </thead>

http://git-wip-us.apache.org/repos/asf/ambari/blob/a44784f0/ambari-web/app/views/common/modal_popups/dependent_configs_list_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/modal_popups/dependent_configs_list_popup.js b/ambari-web/app/views/common/modal_popups/dependent_configs_list_popup.js
index 90729e6..f552abf 100644
--- a/ambari-web/app/views/common/modal_popups/dependent_configs_list_popup.js
+++ b/ambari-web/app/views/common/modal_popups/dependent_configs_list_popup.js
@@ -35,13 +35,17 @@ App.showDependentConfigsPopup = function (configs, primary, secondary)
{
     bodyClass: Em.View.extend({
       templateName: require('templates/common/modal_popups/dependent_configs_list'),
 
-      ToggleAll: Em.Checkbox.extend({
+      toggleAll: Em.Checkbox.extend({
         didInsertElement: function () {
           this.set('checked', !this.get('parentView.parentView.configs').someProperty('saveRecommended',
false));
         },
         click: function () {
           this.get('parentView.parentView.configs').setEach('saveRecommended', this.get('checked'));
-        }
+        },
+        updateCheckbox: function () {
+          console.log('should update its status');
+          this.set('checked', !this.get('parentView.parentView.configs').someProperty('saveRecommended',
false));
+        }.observes('parentView.parentView.configs.@each.saveRecommended')
       })
     }),
     onPrimary: function () {


Mime
View raw message