AMBARI-7105 Configs: compared v2 -> v1 and make current note is incorrect. (atkach)

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

@@ -79,7 +79,7 @@
                       <button class="btn" {{action doCancel target="controller"}} {{bindAttr disabled="view.isDiscardDisabled"}}>{{t common.discard}}</button>
                       <button class="btn btn-success" {{action save target="view"}} {{bindAttr disabled="view.isSaveDisabled"}}>{{t common.save}}</button>
                   </div>
-                  <button class="btn btn-success"  {{action revert target="view"}} {{bindAttr disabled="view.versionActionsDisabled" class="view.compareServiceVersion.isCurrent:hidden"}}>{{view.compareServiceVersion.makeCurrentButtonText}}</button>
+                  <button class="btn btn-success"  {{action revert view.serviceVersionsReferences.compare target="view"}} {{bindAttr disabled="view.versionActionsDisabled" class="view.compareServiceVersion.isCurrent:hidden"}}>{{view.compareServiceVersion.makeCurrentButtonText}}</button>
               </div>
           </div>
       </div>
@@ -134,7 +134,7 @@
                       <button class="btn" {{action doCancel target="controller"}} {{bindAttr disabled="view.isDiscardDisabled"}}>{{t common.discard}}</button>
                       <button class="btn btn-success" {{action save target="view"}} {{bindAttr disabled="view.isSaveDisabled"}}>{{t common.save}}</button>
                   </div>
-                  <button class="btn btn-success"  {{action revert target="view"}} {{bindAttr disabled="view.versionActionsDisabled" class="view.displayedServiceVersion.isCurrent:hidden"}}>{{view.displayedServiceVersion.makeCurrentButtonText}}</button>
+                  <button class="btn btn-success"  {{action revert view.serviceVersionsReferences.displayed target="view"}} {{bindAttr disabled="view.versionActionsDisabled" class="view.displayedServiceVersion.isCurrent:hidden"}}>{{view.displayedServiceVersion.makeCurrentButtonText}}</button>
               </div>
           </div>
       </div>

ambari-web/app/views/common/configs/config_history_flow.js

@@ -35,6 +35,21 @@ App.ConfigHistoryFlowView = Em.View.extend({
   showFullList: false,
   compareServiceVersion: null,
 
+  /**
+   * In reason of absence of properties dynamic values support which passed to an action,
+   * used property map to get latest values of properties for action
+   */
+  serviceVersionsReferences: {
+    displayed: Em.Object.create({
+      isReference: true,
+      property: 'displayedServiceVersion'
+    }),
+    compare: Em.Object.create({
+      isReference: true,
+      property: 'compareServiceVersion'
+    })
+  },
+
   showCompareVersionBar: function() {
     return !Em.isNone(this.get('compareServiceVersion'));
   }.property('compareServiceVersion'),
@@ -325,8 +340,10 @@ App.ConfigHistoryFlowView = Em.View.extend({
       serviceName: this.get('displayedServiceVersion.serviceName'),
       notes:''
     });
-    var versionText = event.context ? event.context.get('versionText') : this.get('displayedServiceVersion.versionText');
-    var configGroupName = this.get('displayedServiceVersion.configGroupName');
+    if (serviceConfigVersion.get('isReference')) {
+      serviceConfigVersion = this.get(serviceConfigVersion.get('property'));
+    }
+    var versionText = serviceConfigVersion.get('versionText');
     return App.ModalPopup.show({
       header: Em.I18n.t('dashboard.configHistory.info-bar.makeCurrent.popup.title'),
       serviceConfigNote: Em.I18n.t('services.service.config.configHistory.makeCurrent.message').format(versionText),