You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/08/27 16:41:52 UTC
[1/2] git commit: AMBARI-7038. Main menu disappears after view-page
refresh. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk eb08925ca -> 940abdc4a
AMBARI-7038. Main menu disappears after view-page refresh. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e3c95fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e3c95fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e3c95fe
Branch: refs/heads/trunk
Commit: 5e3c95fe4efb1efc8cf653f55e2d677208552cd5
Parents: c79fad2
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Aug 27 17:39:29 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Aug 27 17:39:29 2014 +0300
----------------------------------------------------------------------
ambari-web/app/router.js | 2 --
ambari-web/app/routes/main.js | 1 +
ambari-web/app/routes/views.js | 15 +++------------
ambari-web/app/views/main/menu.js | 4 ++--
ambari-web/app/views/main/views_view.js | 2 +-
5 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e3c95fe/ambari-web/app/router.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 9e16359..211651c 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -436,8 +436,6 @@ App.Router = Em.Router.extend({
main: require('routes/main'),
- views: require('routes/views'),
-
experimental: Em.Route.extend({
route: '/experimental',
enter: function (router, context) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e3c95fe/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index f822c48..06a05c5 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -225,6 +225,7 @@ module.exports = Em.Route.extend({
}
}),
+ views: require('routes/views'),
hosts: Em.Route.extend({
route: '/hosts',
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e3c95fe/ambari-web/app/routes/views.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/views.js b/ambari-web/app/routes/views.js
index d72dbf0..b0e2f15 100644
--- a/ambari-web/app/routes/views.js
+++ b/ambari-web/app/routes/views.js
@@ -17,26 +17,17 @@
*/
var App = require('app');
-var stringUtils = require('utils/string_utils');
module.exports = Em.Route.extend({
route: '/views',
enter: function (router) {
- router.getAuthenticated().done(function (loggedIn) {
- if (loggedIn) {
- router.get('mainViewsController').loadAmbariViews();
- } else {
- Em.run.next(function () {
- router.transitionTo('login');
- });
- }
- });
+ router.get('mainViewsController').loadAmbariViews();
},
index: Em.Route.extend({
route: '/',
connectOutlets: function (router) {
router.get('mainViewsController').dataLoading().done(function() {
- router.get('applicationController').connectOutlet('mainViews');
+ router.get('mainController').connectOutlet('mainViews');
});
}
}),
@@ -45,7 +36,7 @@ module.exports = Em.Route.extend({
connectOutlets: function (router, params) {
// find and set content for `mainViewsDetails` and associated controller
router.get('mainViewsController').dataLoading().done(function() {
- router.get('applicationController').connectOutlet('mainViewsDetails', App.router.get('mainViewsController.ambariViews')
+ router.get('mainController').connectOutlet('mainViewsDetails', App.router.get('mainViewsController.ambariViews')
.findProperty('href', ['/views', params.viewName, params.version, params.instanceName].join('/')));
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e3c95fe/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 c9d475a..34eeac4 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -57,7 +57,7 @@ App.MainMenuView = Em.CollectionView.extend({
}
if (App.supports.views) {
- result.push({ label:Em.I18n.t('menu.item.views'), routing:'views', isView:true, views: this.get('views')});
+ result.push({ label:Em.I18n.t('menu.item.views'), routing:'views.index', isView:true, views: this.get('views')});
}
}
@@ -116,7 +116,7 @@ App.MainMenuView = Em.CollectionView.extend({
return this.get('content').routing == 'services';
}.property(''),
isViewsItem: function () {
- return this.get('content').routing == 'views';
+ return this.get('content').routing.contains('views');
}.property(''),
goToSection: function (event) {
if (event.context === 'hosts') {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e3c95fe/ambari-web/app/views/main/views_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/views_view.js b/ambari-web/app/views/main/views_view.js
index 3c97baf..46b3e43 100644
--- a/ambari-web/app/views/main/views_view.js
+++ b/ambari-web/app/views/main/views_view.js
@@ -26,7 +26,7 @@ App.MainViewsView = Em.View.extend({
views: function() {
return App.router.get('mainViewsController.ambariViews');
- }.property('App.router.mainViewsController.ambariViews'),
+ }.property('App.router.mainViewsController.ambariViews.@each'),
selectedViewBinding: 'controller.selectedView'
[2/2] git commit: Merge remote-tracking branch 'origin/trunk' into
origin-trunk
Posted by on...@apache.org.
Merge remote-tracking branch 'origin/trunk' into origin-trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/940abdc4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/940abdc4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/940abdc4
Branch: refs/heads/trunk
Commit: 940abdc4a232c1c354ec3eff17abed89c224c161
Parents: 5e3c95f eb08925
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Aug 27 17:41:40 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Aug 27 17:41:40 2014 +0300
----------------------------------------------------------------------
.../ui/app/components/configSection.js | 48 ++++++++++++++++++++
.../createAppWizard/step3_controller.js | 45 ++++++++++++++----
.../src/main/resources/ui/app/helpers/helper.js | 5 +-
.../app/templates/components/configSection.hbs | 30 ++++++++++++
.../ui/app/templates/createAppWizard/step3.hbs | 4 +-
5 files changed, 122 insertions(+), 10 deletions(-)
----------------------------------------------------------------------