You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/01 17:27:04 UTC
[06/50] [abbrv] git commit: AMABRI-7550. Warning about unsaved
changes does not appearing after navigate to any Admin/View's tab
page.(Ievgen F via xiwang)
AMABRI-7550. Warning about unsaved changes does not appearing after navigate to any Admin/View's tab page.(Ievgen F via xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b346b582
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b346b582
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b346b582
Branch: refs/heads/branch-alerts-dev
Commit: b346b582bd9fc373d43c728a3f07f4f411b8212e
Parents: 3843209
Author: Xi Wang <xi...@apache.org>
Authored: Mon Sep 29 17:24:47 2014 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Sep 30 14:45:56 2014 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/application.js | 4 ++++
ambari-web/app/controllers/main/views_controller.js | 2 +-
ambari-web/app/router.js | 13 +++++++++++++
ambari-web/app/routes/main.js | 3 +--
ambari-web/app/templates/application.hbs | 2 +-
ambari-web/app/views/main/menu.js | 12 ++++++------
6 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b346b582/ambari-web/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js
index 2e5370b..3da9060 100644
--- a/ambari-web/app/controllers/application.js
+++ b/ambari-web/app/controllers/application.js
@@ -88,6 +88,10 @@ App.ApplicationController = Em.Controller.extend(App.UserPref, {
}
},
+ goToAdminView: function () {
+ App.router.route("adminView");
+ },
+
showSettingsPopup: function() {
// Settings only for admins
if (!App.get('isAdmin')) return;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b346b582/ambari-web/app/controllers/main/views_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/views_controller.js b/ambari-web/app/controllers/main/views_controller.js
index f175261..cc3499c 100644
--- a/ambari-web/app/controllers/main/views_controller.js
+++ b/ambari-web/app/controllers/main/views_controller.js
@@ -103,7 +103,7 @@ App.MainViewsController = Em.Controller.extend({
setView: function(event) {
if(event.context){
- App.router.transitionTo('main.views.viewDetails', event.context);
+ App.router.route('main/views/' + event.context.viewName + '/' + event.context.version + '/' + event.context.instanceName);
}
}
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/b346b582/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 997fd68..60967a8 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -469,6 +469,19 @@ App.Router = Em.Router.extend({
main: require('routes/main'),
+ adminView: Em.Route.extend({
+ route: '/adminView',
+ enter: function (router) {
+ if (!router.get('loggedIn') || !App.get('isAdmin') || App.get('isOperator')) {
+ Em.run.next(function () {
+ router.transitionTo('login');
+ });
+ } else {
+ window.location.replace('/views/ADMIN_VIEW/1.0.0/INSTANCE/#/');
+ }
+ }
+ }),
+
experimental: Em.Route.extend({
route: '/experimental',
enter: function (router, context) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b346b582/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index c68f17f..668954b 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -326,8 +326,7 @@ module.exports = Em.Route.extend({
App.router.transitionTo('main.dashboard.index');
});
} else {
- var controller = router.get('mainAdminController');
- router.transitionTo('admin' + controller.get('category').capitalize());
+ this._super(router, event);
}
},
connectOutlets: function (router, context) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b346b582/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 3e1b303..1796a27 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -47,7 +47,7 @@
<ul class="dropdown-menu">
<li><a href="" {{action showAboutPopup target="controller"}}>{{t app.aboutAmbari}}</a></li>
{{#if App.isAdmin}}{{#unless App.isOperator}}
- <li><a href="/views/ADMIN_VIEW/1.0.0/INSTANCE/#/">{{t app.manageAmbari}}</a></li>
+ <li><a href="" {{action goToAdminView target="controller"}}>{{t app.manageAmbari}}</a></li>
{{/unless}}{{/if}}
{{#if isClusterDataLoaded}}
{{#if App.isAdmin}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b346b582/ambari-web/app/views/main/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js
index 4e4fd3f..69d0e45 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -118,7 +118,7 @@ App.MainMenuView = Em.CollectionView.extend({
var itemName = this.get('content').routing;
// route to correct category of current menu item
if (itemName == 'admin') {
- App.router.transitionTo('admin.' + event.context);
+ App.router.route('main/admin/' + event.context);
}
},
dropdownCategories: function () {
@@ -128,19 +128,19 @@ App.MainMenuView = Em.CollectionView.extend({
if (itemName == 'admin') {
categories = [];
categories.push({
- name: 'repositories',
- url: 'adminRepositories',
+ name: 'adminRepositories',
+ url: 'repositories',
label: Em.I18n.t('common.repositories')
});
categories.push({
- name: 'serviceAccounts',
- url: 'adminServiceAccounts',
+ name: 'adminServiceAccounts',
+ url: 'serviceAccounts',
label: Em.I18n.t('common.serviceAccounts')
});
if (App.supports.secureCluster) {
categories.push({
name: 'security',
- url: 'adminSecurity.index',
+ url: 'security/',
label: Em.I18n.t('common.security')
});
}