ソースを参照

AMBARI-7920. Unable to go to Manage Ambari from Installer step9. (akovalenko)

Aleksandr Kovalenko 10 年 前
コミット
e001e62294

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js

@@ -67,7 +67,7 @@ angular.module('ambariAdminConsole')
     list: {
       url: '/views',
       templateUrl: 'views/ambariViews/listTable.html',
-      controller: 'ViewsListCtrl',
+      controller: 'ViewsListCtrl'
     },
     edit: {
       url: '/views/:viewId/versions/:version/instances/:instanceId/edit',

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html

@@ -22,7 +22,7 @@
       <div ng-show="cluster">
         <div id="cluster-name"  ng-switch on="editCluster.editingName">
           <h5 ng-switch-when="false">{{cluster.Clusters.cluster_name}}
-            <i ng-click="toggleEditName()" class="glyphicon glyphicon-edit pull-right edit-cluster-name" tooltip="Rename Cluster"></i>
+            <i ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'" ng-click="toggleEditName()" class="glyphicon glyphicon-edit pull-right edit-cluster-name" tooltip="Rename Cluster"></i>
           </h5>
 
           <form ng-keyup="toggleEditName($event)" tabindex="1" name="editClusterNameForm" class="editClusterNameForm" ng-switch-when="true"

+ 7 - 2
ambari-web/app/routes/installer.js

@@ -392,8 +392,13 @@ module.exports = Em.Route.extend({
         }
       }
     },
-    unroutePath: function () {
-      return false;
+    unroutePath: function (router, context) {
+      // exclusion for transition to Admin View
+      if (context === '/adminView') {
+        this._super(router, context);
+      } else {
+        return false;
+      }
     },
     next: function (router) {
       var installerController = router.get('installerController');