Просмотр исходного кода

AMBARI-15318. Fix dependent keys for CP (onechiporenko)

Oleg Nechiporenko 9 лет назад
Родитель
Сommit
fcdb562059

+ 1 - 3
ambari-web/app/controllers/application.js

@@ -45,9 +45,7 @@ App.ApplicationController = Em.Controller.extend(App.UserPref, {
 
   isExistingClusterDataLoaded: Em.computed.and('App.router.clusterInstallCompleted', 'isClusterDataLoaded'),
 
-  enableLinks: function() {
-    return this.get('isExistingClusterDataLoaded') && !App.get('isOnlyViewUser');
-  }.property('isExistingClusterDataLoaded'),
+  enableLinks: Em.computed.and('isExistingClusterDataLoaded', '!App.isOnlyViewUser'),
 
   /**
    * Determines if "Exit" menu-item should be shown

+ 3 - 5
ambari-web/app/controllers/experimental.js

@@ -20,14 +20,12 @@ var App = require('app');
 App.ExperimentalController = Em.Controller.extend(App.UserPref, {
   name: 'experimentalController',
   supports: function () {
-    var supports = [];
-    Em.keys(App.get('supports')).forEach(function (sup) {
-      supports.push(Ember.Object.create({
+    return Em.keys(App.get('supports')).map(function (sup) {
+      return Ember.Object.create({
         name: sup,
         selected: App.get('supports')[sup]
-      }));
+      });
     });
-    return supports;
   }.property('App.supports'),
 
 

+ 1 - 1
ambari-web/app/controllers/main.js

@@ -37,7 +37,7 @@ App.MainController = Em.Controller.extend({
       }
       $('title').text(Em.I18n.t('app.name.subtitle').format(name));
     }
-  }.observes('App.router.clusterController.clusterName, App.router.clusterInstallCompleted', 'App.router.clusterController.isLoaded'),
+  }.observes('App.router.clusterController.clusterName', 'App.router.clusterInstallCompleted', 'App.router.clusterController.isLoaded'),
 
   isClusterDataLoaded: Em.computed.alias('App.router.clusterController.isLoaded'),
 

+ 1 - 3
ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js

@@ -90,9 +90,7 @@ App.WidgetWizardController = App.WizardController.extend({
     widgetValues: [],
     widgetName: "",
     widgetDescription: "",
-    widgetAuthor: function () {
-      return App.router.get('loginName');
-    }.property('App.router.loginName'),
+    widgetAuthor: Em.computed.alias('App.router.loginName'),
     widgetScope: null
   }),
 

+ 1 - 1
ambari-web/app/views/main/service/reassign/step3_view.js

@@ -41,5 +41,5 @@ App.ReassignMasterWizardStep3View = Em.View.extend({
     }
 
     return false;
-  }.property('controller.content.reassign.display_name, controller.content.databaseType')
+  }.property('controller.content.reassign.display_name', 'controller.content.databaseType')
 });

+ 2 - 0
ambari-web/test/controllers/application_test.js

@@ -33,6 +33,8 @@ describe('App.ApplicationController', function () {
 
   App.TestAliases.testAsComputedAnd(getController(), 'isExistingClusterDataLoaded', ['App.router.clusterInstallCompleted','isClusterDataLoaded']);
 
+  App.TestAliases.testAsComputedAnd(getController(), 'enableLinks', ['isExistingClusterDataLoaded','!App.isOnlyViewUser']);
+
   describe('#showAboutPopup', function() {
     var dataToShowRes = {};
     beforeEach(function () {

+ 1 - 1
ambari-web/test/controllers/main_test.js

@@ -142,7 +142,7 @@ describe('App.MainController', function () {
     });
   });
 
-  describe.skip('#updateTitle', function() {
+  describe('#updateTitle', function() {
     beforeEach(function () {
       sinon.stub(App.router, 'get', function(message){
         if (message === 'clusterController.clusterName') {