Parcourir la source

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

Oleg Nechiporenko il y a 10 ans
Parent
commit
b4d7605496

+ 1 - 2
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

+ 1 - 7
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,
 
   /**

+ 2 - 3
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}}

+ 1 - 1
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}}