Repository: ambari Updated Branches: refs/heads/branch-2.4 ae50dab16 -> 327db732e
AMBARI-20158 - Host filter is missing for admin user after upgrading to ambari 2.4.2 or above (rzang) Change-Id: Icd8a54c1975144718d109a72ad6efe90b9f7ccaa Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/327db732 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/327db732 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/327db732 Branch: refs/heads/branch-2.4 Commit: 327db732ef5b0053b639870265672049ffa2837b Parents: ae50dab Author: Richard Zang <[email protected]> Authored: Thu Feb 23 15:58:18 2017 -0800 Committer: Richard Zang <[email protected]> Committed: Mon Apr 17 17:52:35 2017 -0700 ---------------------------------------------------------------------- ambari-web/app/config.js | 1 - ambari-web/app/controllers/experimental.js | 2 +- ambari-web/app/templates/main/host/combo_search_box.hbs | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/327db732/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 06faf27..ce6516e 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -78,7 +78,6 @@ App.supports = { showPageLoadTime: false, skipComponentStartAfterInstall: false, preInstallChecks: false, - hostComboSearchBox: true, serviceAutoStart: false, logSearch: true, redhatSatellite: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/327db732/ambari-web/app/controllers/experimental.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/experimental.js b/ambari-web/app/controllers/experimental.js index 3642cd9..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', response); + App.set('supports', $.extend(App.get('supports'), response)); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/327db732/ambari-web/app/templates/main/host/combo_search_box.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/combo_search_box.hbs b/ambari-web/app/templates/main/host/combo_search_box.hbs index 6b118a9..6830e4b 100644 --- a/ambari-web/app/templates/main/host/combo_search_box.hbs +++ b/ambari-web/app/templates/main/host/combo_search_box.hbs @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -{{#if App.supports.hostComboSearchBox}} <br/> {{#if view.errMsg}} <div class="alert alert-error"> @@ -23,4 +22,3 @@ </div> {{/if}} <div id="combo_search_box"></div> -{{/if}} \ No newline at end of file
