You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2015/04/29 14:19:28 UTC
ambari git commit: AMBARI-10832. Comparing of enhanced config
versions does not show full comparison-bar (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 2514cda00 -> 4a579a72e
AMBARI-10832. Comparing of enhanced config versions does not show full comparison-bar (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a579a72
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a579a72
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a579a72
Branch: refs/heads/trunk
Commit: 4a579a72eb320f12b9aabb78ab0a4f7f1047009e
Parents: 2514cda
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Apr 29 15:16:39 2015 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Apr 29 15:16:39 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 4 ++--
.../app/templates/common/configs/service_config_layout_tab.hbs | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a579a72/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 64cdcc8..5715059 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -377,7 +377,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
onConfigGroupChange: function () {
var self = this;
this.get('stepConfigs').clear();
- this.set('dataIsLoaded', false);
+ this.set('versionLoaded', false);
var selectedConfigGroup = this.get('selectedConfigGroup');
var serviceName = this.get('content.serviceName');
//STEP 1: handle tags from JSON data for host overrides
@@ -418,7 +418,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
self.addHostNamesToConfig();
//load configs of version being compared against
self.loadCompareVersionConfigs(self.get('allConfigs')).done(function (isComparison) {
- //Load and add overriden configs of group
+ //Load and add overridden configs of group
if (!isComparison && (!self.get('selectedConfigGroup').get('isDefault') || self.get('isCurrentSelected'))) {
App.config.loadServiceConfigGroupOverrides(self.get('allConfigs'), self.get('loadedGroupToOverrideSiteToTagMap'), self.get('configGroupsToLoad'), self.onLoadOverrides, self);
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a579a72/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
index 44f0abc..a06afa0 100644
--- a/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_layout_tab.hbs
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
+{{#if versionLoaded}}
{{#unless tab.isHiddenByFilter}}
<div class="section-layout-container">
<table class="config-section-table">
@@ -51,4 +52,5 @@
{{/each}}
</table>
</div>
-{{/unless}}
\ No newline at end of file
+{{/unless}}
+{{/if}}