AMBARI-1645. Undo should not be allowed on component hosts. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1460091 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -509,6 +509,10 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1645. Undo should not be allowed on component hosts. (yusaku)
+
+ AMBARI-1644. Service summary page flickers. (yusaku)
+
  AMBARI-1689. 500 Exception creating service component during install. (Sumit 
  Mohanty via swagle)
 

ambari-web/app/messages.js

@@ -112,6 +112,8 @@ Em.I18n.translations = {
   'common.upgrade': 'Upgrade',
   'common.security':'Security',
   'common.cluster':'Cluster',
+  'common.exception':'Exception',
+  'common.undo':'Undo',
 
   'hostPopup.noHostsToShow':'No hosts to show',
   'hostPopup.noTasksToShow':'No tasks to show',
@@ -313,6 +315,7 @@ Em.I18n.translations = {
   'installer.step7.header':'Customize Services',
   'installer.step7.body':'We have come up with recommended configurations for the services you selected. Customize them as you see fit.',
   'installer.step7.attentionNeeded':'<b>Attention:</b> Some configurations need your attention before you can proceed.',
+  'installer.step7.config.addProperty':'Add Property',
   'installer.step7.ConfigErrMsg.header':'Custom configuration error: ',
   'installer.step7.ConfigErrMsg.message':'Error in custom configuration. Some properties entered in the box are already exposed on this page',
 

ambari-web/app/models/service_config.js

@@ -177,6 +177,22 @@ App.ServiceConfigProperty = Ember.Object.extend({
     var isEditable = this.get('isEditable');
     return isEditable && dValue != null && value !== dValue;
   }.property('value', 'defaultValue', 'isEditable'),
+
+  /**
+   * Don't show "Undo" for hosts on Installer Step7
+   */
+  cantBeUndone: function() {
+    var types = ["masterHost", "slaveHosts", "masterHosts", "slaveHost"];
+    var displayType = this.get('displayType');
+    var result = false;
+    types.forEach(function(type) {
+      if (type === displayType) {
+        result = true;
+        return;
+      }
+    });
+    return result;
+  }.property('displayType'),
   
   initialValue: function () {
     var masterComponentHostsInDB = App.db.getMasterComponentHosts();

ambari-web/app/templates/common/configs/service_config.hbs

@@ -39,13 +39,16 @@
                               <div {{bindAttr class="errorMessage:error: :control-group"}}>
                                 {{view viewClass serviceConfigBinding="this" categoryConfigsBinding="view.categoryConfigs" }}
                                 {{#if isOverridable}}
-                                    <a class="action" {{action "createOverrideProperty" this target="view" }} ><i class="icon-plus-sign"></i>Exception</a>
+                                  <a class="action" {{action "createOverrideProperty" this target="view" }} ><i class="icon-plus-sign"></i>{{t common.exception}}</a>
                                 {{/if}}
-                                {{#if isNotDefaultValue}}
-                                    <a class="action" {{action "doRestoreDefaultValue" this target="view" }} ><i class="icon-undo"></i>Undo</a>
+                                {{#if cantBeUndone}}
+                                {{else}}
+                                  {{#if isNotDefaultValue}}
+                                    <a class="action" {{action "doRestoreDefaultValue" this target="view" }} ><i class="icon-undo"></i>{{t common.undo}}</a>
+                                  {{/if}}
                                 {{/if}}
                                 {{#if isRemovable}}
-                                    <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>Remove</a>
+                                  <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
                                 {{/if}}
                                   <span class="help-inline">{{errorMessage}}</span>
                               </div>
@@ -59,7 +62,7 @@
                   {{! For Advanced, Advanced Core Site, Advanced HDFS Site sections, show the 'Add Property' link.}}
                   {{#if category.canAddProperty }}
                       <div>
-                          <a href="#" {{action "showAddPropertyWindow" this target="view" }} >Add Property...</a>
+                          <a href="#" {{action "showAddPropertyWindow" this target="view" }} >{{t installer.step7.config.addProperty}}...</a>
                       </div>
                   {{/if}}
                 </form>