Quellcode durchsuchen

AMBARI-1145. Cluster Management refactoring. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1431811 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako vor 12 Jahren
Ursprung
Commit
f846bfa1de

+ 12 - 3
ambari-web/app/controllers/main/service/info/configs.js

@@ -213,14 +213,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
     console.log("TRACE: In setServiceTagNames function:");
     var newServiceConfigTags = [];
     var serviceConfigTags = this.get('serviceConfigTags');
-    var time = new Date().getMilliseconds();
-    console.log("The value of time is: " + time);
     for (var index in serviceConfigTags) {
       console.log("The value of serviceConfigTags[index]: " + serviceConfigTags[index]);
       newServiceConfigTags.pushObject({
         siteName: index,
         tagName: serviceConfigTags[index],
-        newTagName: serviceConfigTags[index] + time
+        newTagName: null
       }, this);
     }
     this.set('serviceConfigTags', newServiceConfigTags);
@@ -654,6 +652,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
    * Set all site property that are derived from other site-properties
    */
   setConfigValue: function (uiConfig, config) {
+    if (config.value == null) {
+      return;
+    }
     var fkValue = config.value.match(/<(foreignKey.*?)>/g);
     if (fkValue) {
       fkValue.forEach(function (_fkValue) {
@@ -706,6 +707,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
   createConfigurations: function () {
     var result = true;
     var serviceConfigTags = this.get('serviceConfigTags');
+    this.setNewTagNames(serviceConfigTags);
     serviceConfigTags.forEach(function (_serviceTags) {
       if (_serviceTags.siteName === 'global') {
         console.log("TRACE: Inside global");
@@ -720,6 +722,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
     return result;
   },
 
+  setNewTagNames: function(serviceConfigs) {
+    var time = (new Date).getTime();
+    serviceConfigs.forEach(function(_serviceConfigs){
+      _serviceConfigs.newTagName =  'version' + time;
+    },this);
+  },
+
   createConfigSite: function (data) {
     var result;
     var realData = data;

+ 4 - 0
ambari-web/app/controllers/main/service/item.js

@@ -108,6 +108,8 @@ App.MainServiceItemController = Em.Controller.extend({
           }
           App.router.get('backgroundOperationsController').showPopup();
         });
+        self.set('content.isStopDisabled',true);
+        self.set('content.isStartDisabled',true);
         this.hide();
       },
       onSecondary: function() {
@@ -162,6 +164,8 @@ App.MainServiceItemController = Em.Controller.extend({
           }
           App.router.get('backgroundOperationsController').showPopup();
         });
+        self.set('content.isStopDisabled',true);
+        self.set('content.isStartDisabled',true);
         this.hide();
       },
       onSecondary: function () {