incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-3329. YARN Capacity Scheduler configuration entry should be in Scheduler section. (xiwang via yusaku)
Date Wed, 25 Sep 2013 01:23:48 GMT
Updated Branches:
  refs/heads/branch-1.4.1 8554604df -> 6f5c1a4d4


AMBARI-3329. YARN Capacity Scheduler configuration entry should be in Scheduler section. (xiwang
via yusaku)


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

Branch: refs/heads/branch-1.4.1
Commit: 6f5c1a4d40485a88df06b4be9172953ee574e09e
Parents: 8554604
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Tue Sep 24 18:23:02 2013 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Tue Sep 24 18:23:36 2013 -0700

----------------------------------------------------------------------
 ambari-web/app/utils/config.js               | 2 +-
 ambari-web/app/views/wizard/controls_view.js | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6f5c1a4d/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 78ef970..0e269c3 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -893,7 +893,7 @@ App.config = Em.Object.create({
       "isVisible": true,
       "serviceName": "YARN",
       "filename": "capacity-scheduler.xml",
-      "category": "ResourceManager"
+      "category": "CapacityScheduler"
     }
   ],
 

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6f5c1a4d/ambari-web/app/views/wizard/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js
index ad48cfb..456c18c 100644
--- a/ambari-web/app/views/wizard/controls_view.js
+++ b/ambari-web/app/views/wizard/controls_view.js
@@ -71,15 +71,14 @@ App.ServiceConfigTextField = Ember.TextField.extend(App.ServiceConfigPopoverSupp
   },
 
   textFieldClassName: function () {
-    // sets the width of the field depending on display type
-    if (['directory', 'url', 'email', 'user', 'host','advanced'].contains(this.get('serviceConfig.displayType')))
{
-      return ['span9'];
+    if (this.get('serviceConfig.unit')) {
+      return ['input-small'];
     } else if (this.get('serviceConfig.displayType') === 'principal'){
       return ['span12'];
     } else {
-      return ['input-small'];
+      return ['span9'];
     }
-  }.property('serviceConfig.displayType'),
+  }.property('serviceConfig.displayType', 'serviceConfig.unit'),
 
   disabled: function () {
     return !this.get('serviceConfig.isEditable');


Mime
View raw message