Repository: ambari Updated Branches: refs/heads/branch-2.5 3779ac40c -> 7ce52f703
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/7ce52f70 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7ce52f70 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7ce52f70 Branch: refs/heads/branch-2.5 Commit: 7ce52f7035450d3cd72e35eaf5a158ae7f825c55 Parents: 3779ac4 Author: Richard Zang <[email protected]> Authored: Thu Feb 23 15:58:18 2017 -0800 Committer: Richard Zang <[email protected]> Committed: Thu Feb 23 16:07:03 2017 -0800 ---------------------------------------------------------------------- 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/7ce52f70/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index f35e040..451416d 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/7ce52f70/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/7ce52f70/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
