AMBARI-20732. Remove duplicate condition from route (onechiponerko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2760cda0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2760cda0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2760cda0 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 2760cda04c2222a7fd8fa85cf643444acbb735eb Parents: d3036fd Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Apr 11 13:57:44 2017 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Apr 11 18:55:03 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/main.js | 2 +- ambari-web/test/controllers/main_test.js | 1 - ambari-web/test/init_test.js | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2760cda0/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 0a2375e..1f881e0 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -653,7 +653,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, { route: '/serviceAutoStart', enter: function(router, transition) { - if (router.get('loggedIn') && !App.isAuthorized('CLUSTER.MANAGE_AUTO_START') && !App.isAuthorized('CLUSTER.MANAGE_AUTO_START')) { + if (router.get('loggedIn') && !App.isAuthorized('CLUSTER.MANAGE_AUTO_START')) { router.transitionTo('main.dashboard.index'); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/2760cda0/ambari-web/test/controllers/main_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main_test.js b/ambari-web/test/controllers/main_test.js index 9673092..573b1e9 100644 --- a/ambari-web/test/controllers/main_test.js +++ b/ambari-web/test/controllers/main_test.js @@ -17,7 +17,6 @@ */ var App = require('app'); -var testHelpers = require('test/helpers'); describe('App.MainController', function () { var mainController = App.MainController.create(); http://git-wip-us.apache.org/repos/asf/ambari/blob/2760cda0/ambari-web/test/init_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/init_test.js b/ambari-web/test/init_test.js index db72744..f6b572a 100644 --- a/ambari-web/test/init_test.js +++ b/ambari-web/test/init_test.js @@ -91,6 +91,7 @@ if (!Array.prototype.includes) { }); } +/* eslint-disable */ if (typeof Object.assign != 'function') { Object.assign = function(target, varArgs) { // .length of function is 2 'use strict'; @@ -115,6 +116,7 @@ if (typeof Object.assign != 'function') { return to; }; } +/* eslint-enable */ Number.isFinite = Number.isFinite || function(value) { return typeof value === 'number' && isFinite(value);