ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject git commit: AMBARI-7920. Unable to go to Manage Ambari from Installer step9. (akovalenko)
Date Thu, 23 Oct 2014 13:12:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk d2b8f3e96 -> e001e6229


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


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

Branch: refs/heads/trunk
Commit: e001e62294ed13cb0a8bbcfcd5fa1e4e5666e92a
Parents: d2b8f3e
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Thu Oct 23 15:49:51 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Thu Oct 23 16:05:07 2014 +0300

----------------------------------------------------------------------
 .../src/main/resources/ui/admin-web/app/scripts/routes.js   | 2 +-
 .../main/resources/ui/admin-web/app/views/leftNavbar.html   | 2 +-
 ambari-web/app/routes/installer.js                          | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e001e622/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
index bc07133..8a99c18 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
+++ b/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',

http://git-wip-us.apache.org/repos/asf/ambari/blob/e001e622/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
index 8bc1472..eaea2e8 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
+++ b/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"

http://git-wip-us.apache.org/repos/asf/ambari/blob/e001e622/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 4c1dd61..9fc3d39 100644
--- a/ambari-web/app/routes/installer.js
+++ b/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');


Mime
View raw message