Repository: ambari Updated Branches: refs/heads/trunk c2c72b9da -> 3c939bd23
AMBARI-20158 - Host filter is missing for admin user after upgrading to ambari 2.4.2 or above (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c939bd2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c939bd2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c939bd2 Branch: refs/heads/trunk Commit: 3c939bd233439028e31e99daf0ed4141f81350af Parents: c2c72b9 Author: Richard Zang <rz...@apache.org> Authored: Thu Feb 23 15:58:18 2017 -0800 Committer: Richard Zang <rz...@apache.org> Committed: Thu Feb 23 15:58:36 2017 -0800 ---------------------------------------------------------------------- ambari-web/app/config.js | 1 - ambari-web/app/controllers/experimental.js | 2 +- .../app/templates/main/host/combo_search_box.hbs | 15 +++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3c939bd2/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 6afa810..47eb788 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -81,7 +81,6 @@ App.supports = { showPageLoadTime: false, skipComponentStartAfterInstall: false, preInstallChecks: false, - hostComboSearchBox: true, serviceAutoStart: true, logSearch: true, redhatSatellite: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/3c939bd2/ambari-web/app/controllers/experimental.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/experimental.js b/ambari-web/app/controllers/experimental.js index 8b93761..25f7add 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', $.merge(response, App.get('supports'))); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/3c939bd2/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 d54b7df..6de6774 100644 --- a/ambari-web/app/templates/main/host/combo_search_box.hbs +++ b/ambari-web/app/templates/main/host/combo_search_box.hbs @@ -15,11 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -{{#if App.supports.hostComboSearchBox}} - {{#if view.errMsg}} - <div class="alert alert-danger"> - {{view.errMsg}} - </div> - {{/if}} - <div id="combo_search_box"></div> -{{/if}} \ No newline at end of file +{{#if view.errMsg}} +<div class="alert alert-danger"> + {{view.errMsg}} +</div> +{{/if}} +<div id="combo_search_box"></div> +