ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-17963 Hide remove NameNode buttons for assign Hive Interactive popup. (ababiichuk)
Date Fri, 29 Jul 2016 17:23:57 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 89ec7178a -> 5af78751e


AMBARI-17963 Hide remove NameNode buttons for assign Hive Interactive popup. (ababiichuk)


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

Branch: refs/heads/branch-2.4
Commit: 5af78751e88d8bfc96fd9f1b33dc18ff03d1cde8
Parents: 89ec717
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Fri Jul 29 20:15:07 2016 +0300
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Fri Jul 29 20:23:42 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/app.js                                        | 4 ++++
 .../app/controllers/wizard/step7/assign_master_controller.js | 8 ++++++++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5af78751/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 79493a1..53394a0 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -311,6 +311,10 @@ module.exports = Em.Application.create({
    * @type {Em.Object}
    */
   components: Em.Object.create({
+    isMasterAddableOnlyOnHA: function () {
+      return App.StackServiceComponent.find().filterProperty('isMasterAddableOnlyOnHA').mapProperty('componentName')
+    }.property('App.router.clusterController.isLoaded'),
+
     allComponents: function () {
       return App.StackServiceComponent.find().mapProperty('componentName')
     }.property('App.router.clusterController.isLoaded'),

http://git-wip-us.apache.org/repos/asf/ambari/blob/5af78751/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index 4ea1e65..f369143 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -42,6 +42,14 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
   markSavedComponentsAsInstalled: true,
 
   /**
+   * Array of master component names, that should be addable
+   * Are used in HA wizards to add components, that are not addable for other wizards
+   * @type {Array}
+   * @override
+   */
+  mastersAddableInHA: Em.computed.alias('App.components.isMasterAddableOnlyOnHA'),
+
+  /**
    * Marks component add/delete action to be performed ahead.
    * @param context {Object} Context of the calling function
    * @param action {String} ADD|DELETE


Mime
View raw message