ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject ambari git commit: AMBARI-10442. Comparison is invisible on the Enhanced Configs tabs (onechiporenko)
Date Fri, 10 Apr 2015 15:37:44 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 82c90a7dc -> 3eba89a14


AMBARI-10442. Comparison is invisible on the Enhanced Configs tabs (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3eba89a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3eba89a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3eba89a1

Branch: refs/heads/trunk
Commit: 3eba89a146d533c47f95ecefef13acfb6c2a7a31
Parents: 82c90a7
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Fri Apr 10 18:34:24 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Fri Apr 10 18:34:24 2015 +0300

----------------------------------------------------------------------
 .../comparison/config_widget_comparison.hbs     |  4 +-
 .../common/configs/widgets/controls.hbs         | 46 ++++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3eba89a1/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
index b5975de..4ca3e0a 100644
--- a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs
@@ -18,7 +18,8 @@
 
 {{#each compareConfig in view.serviceConfigProperty.compareConfigs}}
   <div {{bindAttr class=":control-group :overrideField"}}>
-    {{view view.serviceConfigProperty.widget configBinding="compareConfig" categoryConfigsAllBinding="view.parentView.categoryConfigsAll"
isPopoverEnabled="false"}}
+    {{view view.serviceConfigProperty.widget canEditBinding="view.canEdit" configBinding="compareConfig"
categoryConfigsAllBinding="view.parentView.categoryConfigsAll" isPopoverEnabled="false"}}
+    <div class="clearfix">
       <span class="label label-info">{{compareConfig.serviceVersion.versionText}}</span>
       {{#if compareConfig.serviceVersion.isCurrent}}
         <span class="label label-success">{{t common.current}}</span>
@@ -30,5 +31,6 @@
           </a>
         {{/if}}
       {{/unless}}
+    </div>
   </div>
 {{/each}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3eba89a1/ambari-web/app/templates/common/configs/widgets/controls.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index 89204e1..37b3478 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -40,30 +40,28 @@
       {{view App.RestoreConfigView visibleBinding="view.undoAllowed"}}
     {{/if}}
   </div>
-
-  {{#if view.isComparison}}
-    {{#if controller.selectedConfigGroup.isDefault}}
-      <span
-          class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
-      {{#if controller.isCurrentSelected}}
-        <span class="label label-success">{{t common.current}}</span>
-      {{/if}}
-    {{else}}
-      <span class="label label-info">{{t common.default}}
-        &nbsp;{{t services.service.config.configHistory.configGroup}}</span>
+{{/if}}
+{{#if view.isComparison}}
+  <div class="clearfix">
+  {{#if controller.selectedConfigGroup.isDefault}}
+    <span
+        class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
+    {{#if controller.isCurrentSelected}}
+      <span class="label label-success">{{t common.current}}</span>
     {{/if}}
+  {{else}}
+    <span class="label label-info">{{t common.default}}
+      &nbsp;{{t services.service.config.configHistory.configGroup}}</span>
   {{/if}}
-
-  {{#if view.isOriginalSCP}}
-    {{view App.ConfigWidgetOverrideView
-    serviceConfigPropertyBinding="view.config"
-    isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"
-    }}
-  {{/if}}
-
-  {{#if view.isComparison}}
-    {{view App.ConfigWidgetComparisonView serviceConfigPropertyBinding="view.config"}}
-  {{/if}}
-{{else}}
-  <div class="clearfix"></div>
+  </div>
 {{/if}}
+{{#if view.isOriginalSCP}}
+  {{view App.ConfigWidgetOverrideView
+  serviceConfigPropertyBinding="view.config"
+  isDefaultGroupSelectedBinding="controller.selectedConfigGroup.isDefault"
+  }}
+{{/if}}
+
+{{#if view.isComparison}}
+  {{view App.ConfigWidgetComparisonView serviceConfigPropertyBinding="view.config"}}
+{{/if}}
\ No newline at end of file


Mime
View raw message