Author: yusaku
Date: Wed Apr 24 23:43:49 2013
New Revision: 1471784
URL: http://svn.apache.org/r1471784
Log:
AMBARI-2020. Incorrect behavior of "Services" page. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/routes/main.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1471784&r1=1471783&r2=1471784&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Apr 24 23:43:49 2013
@@ -790,6 +790,8 @@ Trunk (unreleased changes):
Farrellee via mahadev)
BUG FIXES
+
+ AMBARI-2020. Incorrect behavior of "Services" page. (yusaku)
AMBARI-2018. Hosts page: no filter selection is shown after clicking on
"Alerts" filter, navigating away, and coming back to Hosts page. (yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/routes/main.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/main.js?rev=1471784&r1=1471783&r2=1471784&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/main.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/main.js Wed Apr 24 23:43:49
2013
@@ -783,17 +783,17 @@ module.exports = Em.Route.extend({
services: Em.Route.extend({
route: '/services',
index: Ember.Route.extend({
- route: '/'
+ route: '/',
+ enter: function (router) {
+ Ember.run.next(function () {
+ var service = router.get('mainServiceItemController.content');
+ if (!service) {
+ service = App.Service.find().objectAt(0); // getting the first
service to display
+ }
+ router.transitionTo('service.summary', service);
+ });
+ }
}),
- enter: function (router) {
- Ember.run.next(function () {
- var service = router.get('mainServiceItemController.content');
- if (!service) {
- service = App.Service.find().objectAt(0); // getting the first
service to display
- }
- router.transitionTo('service.summary', service);
- });
- },
connectOutlets: function (router, context) {
router.get('mainController').connectOutlet('mainService');
},
