You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/01/15 13:08:09 UTC
ambari git commit: AMBARI-9144 Admin->Stack and upgrade page: Add
Service link for kerberos service should open "Enable Kerberos wizard".
(ababichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 65393a52e -> fe3b93c87
AMBARI-9144 Admin->Stack and upgrade page: Add Service link for kerberos service should open "Enable Kerberos wizard". (ababichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe3b93c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe3b93c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe3b93c8
Branch: refs/heads/trunk
Commit: fe3b93c87a54d96ff531f5e927f851c0a11ab7c2
Parents: 65393a5
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Jan 15 13:20:33 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Jan 15 14:07:43 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/admin/kerberos.js | 2 +-
.../controllers/main/admin/stack_and_upgrade_controller.js | 2 +-
.../app/views/main/admin/stack_upgrade/services_view.js | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe3b93c8/ambari-web/app/controllers/main/admin/kerberos.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js
index 640c92c..7d1cc89 100644
--- a/ambari-web/app/controllers/main/admin/kerberos.js
+++ b/ambari-web/app/controllers/main/admin/kerberos.js
@@ -104,7 +104,7 @@ App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({
startKerberosWizard: function () {
this.setAddSecurityWizardStatus('RUNNING');
- App.router.transitionTo('adminAddKerberos');
+ App.router.transitionTo('adminKerberos.adminAddKerberos');
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe3b93c8/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 6970ff0..01a9015 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -134,7 +134,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
if (currentVersion) {
self.set('currentVersion', {
repository_version: currentVersion.get('repositoryVersion.repositoryVersion'),
- repository_name: currentVersion.get('repositoryVersion.displayName'),
+ repository_name: currentVersion.get('repositoryVersion.displayName')
});
}
dfd.resolve();
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe3b93c8/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
index 0b9bbb0..f08e82e 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
@@ -37,7 +37,11 @@ App.MainAdminStackServicesView = Em.View.extend({
* @param event
*/
goToAddService: function (event) {
- App.router.get('addServiceController').set('serviceToInstall', event.context);
- App.get('router').transitionTo('main.serviceAdd');
+ if (event.context == "KERBEROS") {
+ App.get('router.mainAdminKerberosController').checkAndStartKerberosWizard();
+ } else {
+ App.router.get('addServiceController').set('serviceToInstall', event.context);
+ App.get('router').transitionTo('main.serviceAdd');
+ }
}
});