Revert "AMBARI-6967. Admin View: default login behavior (route to Admin View, 
Cluster Dashboard, or Views Landing page). (yusaku)"

This reverts commit cb1a5c0baa049d670215e76505dd661d105333bb.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ca9fb86
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ca9fb86
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ca9fb86

Branch: refs/heads/branch-alerts-dev
Commit: 6ca9fb864a5c8c8b94d72f82e7fdedde34e0d825
Parents: cb1a5c0
Author: Yusaku Sako <yus...@hortonworks.com>
Authored: Fri Aug 22 14:32:56 2014 -0700
Committer: Yusaku Sako <yus...@hortonworks.com>
Committed: Fri Aug 22 14:32:56 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/routes/views.js | 53 -------------------------------------
 1 file changed, 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ca9fb86/ambari-web/app/routes/views.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/views.js b/ambari-web/app/routes/views.js
deleted file mode 100644
index d72dbf0..0000000
--- a/ambari-web/app/routes/views.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-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');
-        });
-      }
-    });
-  },
-  index: Em.Route.extend({
-    route: '/',
-    connectOutlets: function (router) {
-      router.get('mainViewsController').dataLoading().done(function() {
-        router.get('applicationController').connectOutlet('mainViews');
-      });
-    }
-  }),
-  viewDetails: Em.Route.extend({
-    route: '/:viewName/:version/:instanceName',
-    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')
-          .findProperty('href', ['/views', params.viewName, params.version, 
params.instanceName].join('/')));
-      });
-    }
-  })
-});

Reply via email to