You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/11/03 18:33:42 UTC
git commit: AMBARI-7036 restrict /#/experimental to only
AMBARI.ADMIN.2 (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 7a22e62ea -> aeff76e14
AMBARI-7036 restrict /#/experimental to only AMBARI.ADMIN.2 (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aeff76e1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aeff76e1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aeff76e1
Branch: refs/heads/trunk
Commit: aeff76e14be1a32ab564a232fe8f6c23e0c198f9
Parents: 7a22e62
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Nov 3 17:10:26 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Nov 3 18:23:48 2014 +0200
----------------------------------------------------------------------
.../app/assets/data/ambari_components/component_version.json | 5 ++++-
ambari-web/app/router.js | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aeff76e1/ambari-web/app/assets/data/ambari_components/component_version.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/ambari_components/component_version.json b/ambari-web/app/assets/data/ambari_components/component_version.json
index 0a8c03e..8123cfa 100644
--- a/ambari-web/app/assets/data/ambari_components/component_version.json
+++ b/ambari-web/app/assets/data/ambari_components/component_version.json
@@ -2,6 +2,9 @@
"RootServiceComponents" : {
"component_name" : "AMBARI_SERVER",
"component_version" : "1.3.0",
- "service_name" : "AMBARI"
+ "service_name" : "AMBARI",
+ "properties": {
+ "server.os_type": "redhat"
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/aeff76e1/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index f5948be..9c27ba9 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -469,8 +469,10 @@ App.Router = Em.Router.extend({
experimental: Em.Route.extend({
route: '/experimental',
enter: function (router, context) {
- if (!App.get('isAdmin')) {
- router.transitionTo("main");
+ if (!App.get('isAdmin') || App.get('isOperator')) {
+ Em.run.next(function () {
+ router.transitionTo("main.dashboard.widgets");
+ });
}
},
connectOutlets: function (router, context) {