ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-9536 Add property button visible when comparing config versions. (atkach)
Date Mon, 09 Feb 2015 18:59:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8f72baf7d -> 0d1272764


AMBARI-9536 Add property button visible when comparing config versions. (atkach)


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

Branch: refs/heads/trunk
Commit: 0d12727642e68288e831605c15b20184e738f8e1
Parents: 8f72baf
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Mon Feb 9 20:36:13 2015 +0200
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Mon Feb 9 20:38:20 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js | 8 ++++++++
 ambari-web/app/templates/main/service/info/configs.hbs  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0d127276/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 f23e2d0..672d53b 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -64,6 +64,14 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
   isCurrentSelected: function () {
     return App.ServiceConfigVersion.find(this.get('content.serviceName') + "_" + this.get('selectedVersion')).get('isCurrent');
   }.property('selectedVersion', 'content.serviceName', 'dataIsLoaded'),
+
+  /**
+   * @type {boolean}
+   */
+  canEdit: function () {
+    return this.get('isCurrentSelected') && !this.get('isCompareMode');
+  }.property('isCurrentSelected', 'isCompareMode'),
+
   serviceConfigs: function () {
     return App.config.get('preDefinedServiceConfigs');
   }.property('App.config.preDefinedServiceConfigs'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/0d127276/ambari-web/app/templates/main/service/info/configs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/configs.hbs b/ambari-web/app/templates/main/service/info/configs.hbs
index 528f95d..c898155 100644
--- a/ambari-web/app/templates/main/service/info/configs.hbs
+++ b/ambari-web/app/templates/main/service/info/configs.hbs
@@ -48,7 +48,7 @@
       {{/isAccessible}}
     {{/if}}
     <div class="clearfix"></div>
-    {{view App.ServiceConfigView filterBinding="controller.filter" columnsBinding="controller.filterColumns"
canEditBinding="controller.isCurrentSelected" showConfigHistoryFeatureBinding="controller.showConfigHistoryFeature"}}
+    {{view App.ServiceConfigView filterBinding="controller.filter" columnsBinding="controller.filterColumns"
canEditBinding="controller.canEdit" showConfigHistoryFeatureBinding="controller.showConfigHistoryFeature"}}
     {{#isAccessible ADMIN}}
       {{#unless showConfigHistoryFeature}}
           <p class="pull-right">


Mime
View raw message