Repository: ambari Updated Branches: refs/heads/trunk c1d73a614 -> bfac23716
AMBARI-5113 Ambari UI doesn't resume updating after logout/login. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bfac2371 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bfac2371 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bfac2371 Branch: refs/heads/trunk Commit: bfac23716749bd098b64d10c2e7f07c189913a44 Parents: c1d73a6 Author: atkach <[email protected]> Authored: Mon Mar 17 19:55:51 2014 +0200 Committer: atkach <[email protected]> Committed: Mon Mar 17 19:55:51 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/assets/data/services/ambari_server.json | 6 ++++++ .../app/assets/data/user_settings/showJobsForNonAdmin.json | 1 + ambari-web/app/controllers/global/cluster_controller.js | 1 + ambari-web/app/utils/ajax.js | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bfac2371/ambari-web/app/assets/data/services/ambari_server.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/services/ambari_server.json b/ambari-web/app/assets/data/services/ambari_server.json new file mode 100644 index 0000000..567feb6 --- /dev/null +++ b/ambari-web/app/assets/data/services/ambari_server.json @@ -0,0 +1,6 @@ +{ + "RootServiceComponents" : { + "properties" : {}, + "component_version": '1.5.0' + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/bfac2371/ambari-web/app/assets/data/user_settings/showJobsForNonAdmin.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/user_settings/showJobsForNonAdmin.json b/ambari-web/app/assets/data/user_settings/showJobsForNonAdmin.json new file mode 100644 index 0000000..27ba77d --- /dev/null +++ b/ambari-web/app/assets/data/user_settings/showJobsForNonAdmin.json @@ -0,0 +1 @@ +true http://git-wip-us.apache.org/repos/asf/ambari/blob/bfac2371/ambari-web/app/controllers/global/cluster_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index 72eeae3..2109248 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -284,6 +284,7 @@ App.ClusterController = Em.Controller.extend({ } if(this.get('isLoaded')) { // do not load data repeatedly + App.router.get('mainController').startPolling(); return; } var clusterUrl = this.getUrl('/data/clusters/cluster.json', '?fields=Clusters'); http://git-wip-us.apache.org/repos/asf/ambari/blob/bfac2371/ambari-web/app/utils/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js index 98d0e83..086c278 100644 --- a/ambari-web/app/utils/ajax.js +++ b/ambari-web/app/utils/ajax.js @@ -1378,7 +1378,7 @@ var urls = { }, 'ambari.service': { 'real': '/services/AMBARI/components/AMBARI_SERVER', - 'mock': '' + 'mock': '/data/services/ambari_server.json' }, 'ambari.service.load_server_clock': { 'real': '/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/server_clock',
