Repository: ambari Updated Branches: refs/heads/trunk 4dac97f72 -> ca7732a9f
AMBARI-13631. cannot go back to ambari dashboard once on the admin view Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ca7732a9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca7732a9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca7732a9 Branch: refs/heads/trunk Commit: ca7732a9f3f3e6a3716ccf014127ae2b65029ada Parents: 4dac97f Author: Alex Antonenko <[email protected]> Authored: Thu Oct 29 16:34:06 2015 +0200 Committer: Alex Antonenko <[email protected]> Committed: Thu Oct 29 16:39:50 2015 +0200 ---------------------------------------------------------------------- ambari-admin/src/main/resources/ui/admin-web/app/index.html | 4 ++-- ambari-web/app/views/main/dashboard/config_history_view.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ca7732a9/ambari-admin/src/main/resources/ui/admin-web/app/index.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html b/ambari-admin/src/main/resources/ui/admin-web/app/index.html index 2cbe010..fe049ac 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html @@ -48,8 +48,8 @@ <header class="navbar navbar-static-top navbar-inverse"> <div class="navbar-inner"> <div class="container"> - <a href="#/" class="logo"><img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"></a> - <a href="#/" class="brand" title="Apache Ambari">Ambari</a> + <a href="/#/main/dashboard" class="logo"><img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"></a> + <a href="/#/main/dashboard" class="brand" title="Apache Ambari">Ambari</a> <ul class="nav navbar-nav navbar-right"> <li> <div class="btn-group navbar-views-dropdown" dropdown is-open="viewsdropdown.isopen" ng-mouseover="viewsdropdown.isopen=true" ng-mouseout="viewsdropdown.isopen=false"> http://git-wip-us.apache.org/repos/asf/ambari/blob/ca7732a9/ambari-web/app/views/main/dashboard/config_history_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/config_history_view.js b/ambari-web/app/views/main/dashboard/config_history_view.js index 5244422..8936004 100644 --- a/ambari-web/app/views/main/dashboard/config_history_view.js +++ b/ambari-web/app/views/main/dashboard/config_history_view.js @@ -45,7 +45,7 @@ App.MainConfigHistoryView = App.TableView.extend(App.TableServerViewMixin, { controllerName = this.get('controller.name'), savedSortConditions = App.db.getSortingStatuses(controllerName) || []; - if (savedSortConditions && savedSortConditions.everyProperty('status', 'sorting')) { + if (savedSortConditions.everyProperty('status', 'sorting')) { savedSortConditions.push({ name: "createTime", status: "sorting_desc"
