ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-10861. Installer not showing enhanced configs when flag set to true (onechiporenko)
Date Thu, 30 Apr 2015 10:16:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 24f2548ae -> b4d760549


AMBARI-10861. Installer not showing enhanced configs when flag set to true (onechiporenko)


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

Branch: refs/heads/trunk
Commit: b4d7605496215b6d4cd9aafd35c7488db9f01f32
Parents: 24f2548
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Thu Apr 30 13:10:38 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Thu Apr 30 13:10:38 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js      | 3 +--
 ambari-web/app/controllers/wizard/step7_controller.js        | 8 +-------
 .../templates/common/configs/service_config_layout_tab.hbs   | 5 ++---
 .../app/templates/common/configs/service_config_wizard.hbs   | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b4d76054/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 5715059..9513b9a 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -173,7 +173,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
   loadedClusterSiteToTagMap: {},
 
   /**
-   * Number of errors in the configs in the selected service
+   * Number of errors in the configs in the selected service (only for AdvancedTab if App
supports Enhanced Configs)
    * @type {number}
    */
   errorsCount: function () {
@@ -377,7 +377,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
   onConfigGroupChange: function () {
     var self = this;
     this.get('stepConfigs').clear();
-    this.set('versionLoaded', false);
     var selectedConfigGroup = this.get('selectedConfigGroup');
     var serviceName = this.get('content.serviceName');
     //STEP 1: handle tags from JSON data for host overrides

http://git-wip-us.apache.org/repos/asf/ambari/blob/b4d76054/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 7a069e9..e019e1d 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -69,19 +69,13 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin,
App.E
   securityEnabled: function () {
     return App.router.get('mainAdminKerberosController.securityEnabled');
   }.property('App.router.mainAdminKerberosController.securityEnabled'),
+
   /**
    * If configChangeObserver Modal is shown
    * @type {bool}
    */
   miscModalVisible: false,
 
-  gangliaAvailableSpace: null,
-
-  /**
-   * @type {string}
-   */
-  gangliaMoutDir: '/',
-
   overrideToAdd: null,
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/b4d76054/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
index a06afa0..6059c42 100644
--- a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
@@ -15,7 +15,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{#if versionLoaded}}
+
 {{#unless tab.isHiddenByFilter}}
 <div class="section-layout-container">
   <table class="config-section-table">
@@ -52,5 +52,4 @@
     {{/each}}
   </table>
 </div>
-{{/unless}}
-{{/if}}
+{{/unless}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/b4d76054/ambari-web/app/templates/common/configs/service_config_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
index 6d51e7f..c12ae08 100644
--- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
@@ -67,7 +67,7 @@
       </li>
     {{/each}}
   </ul>
-  <div class="tab-content">
+  <div class="tab-content service-config-tab-content">
     {{#each tab in view.tabs}}
       <div {{bindAttr class=":tab-pane tab.isActive:active tab.id"}}>
         {{#if tab.isAdvanced}}


Mime
View raw message