AMBARI-20158 - Host filter is missing for admin user after upgrading to ambari 
2.4.2 or above <fix1> (rzang)

(cherry picked from commit df47fa77bfa591f7c8da955b6959f8f12d662889)

Change-Id: I602064a88319ae9c83da871d3195522be801eca4


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

Branch: refs/heads/AMBARI-2.4.2.16
Commit: e3d0b7e8923d42fba3567333c35956f99371f9e3
Parents: 8397eb5
Author: Richard Zang <[email protected]>
Authored: Fri Feb 24 14:07:58 2017 -0800
Committer: Jaimin Jetly <[email protected]>
Committed: Wed Mar 1 12:23:18 2017 -0800

----------------------------------------------------------------------
 ambari-web/app/controllers/experimental.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3d0b7e8/ambari-web/app/controllers/experimental.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/experimental.js 
b/ambari-web/app/controllers/experimental.js
index 6b108c2..29a2e73 100644
--- a/ambari-web/app/controllers/experimental.js
+++ b/ambari-web/app/controllers/experimental.js
@@ -35,7 +35,7 @@ App.ExperimentalController = 
Em.Controller.extend(App.UserPref, {
 
   getUserPrefSuccessCallback: function (response, request, data) {
     if (response) {
-      App.set('supports', $.merge(response, App.get('supports')));
+      App.set('supports', $.extend(App.get('supports'), response));
     }
   },
 

Reply via email to