You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/03/02 20:20:36 UTC
[1/2] ambari git commit: AMBARI-9875. Disable security fails
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 8793f44a7 -> 121924874
AMBARI-9875. Disable security fails (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12192487
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12192487
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12192487
Branch: refs/heads/trunk
Commit: 1219248741ef975bac3f851cbf7a410339cd44c3
Parents: f20500b
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Mar 2 20:48:33 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Mar 2 21:18:25 2015 +0200
----------------------------------------------------------------------
.../main/admin/kerberos/disable_controller.js | 15 +++++----------
ambari-web/app/messages.js | 5 +++--
2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/12192487/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js b/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js
index 00a7da2..ff2bf86 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js
@@ -24,7 +24,7 @@ App.KerberosDisableController = App.KerberosProgressPageController.extend({
name: 'kerberosDisableController',
clusterDeployState: 'DEFAULT',
- commands: ['stopServices', 'unkerberize', 'startServices'],
+ commands: ['stopServices', 'unkerberize', 'deleteKerberos', 'startServices'],
tasksMessagesPrefix: 'admin.kerberos.disable.step',
@@ -39,26 +39,19 @@ App.KerberosDisableController = App.KerberosProgressPageController.extend({
stopServices: function () {
App.ajax.send({
name: 'common.services.update',
+ sender: this,
data: {
context: "Stop services",
"ServiceInfo": {
"state": "INSTALLED"
}
},
- sender: this,
success: 'startPolling',
error: 'onTaskError'
});
},
unkerberize: function () {
- var self = this;
- this.deleteKerberos().always(function () {
- self.reconfigureServices();
- });
- },
-
- reconfigureServices: function () {
return App.ajax.send({
name: 'admin.unkerberize.cluster',
sender: this,
@@ -73,7 +66,9 @@ App.KerberosDisableController = App.KerberosProgressPageController.extend({
sender: this,
data: {
serviceName: 'KERBEROS'
- }
+ },
+ success: 'onTaskCompleted',
+ error: 'onTaskCompleted'
});
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/12192487/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d0c9ee9..947881c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -983,8 +983,9 @@ Em.I18n.translations = {
'admin.kerberos.regenerate_keytabs.checkbox.label': ' Only regenerate keytabs for missing hosts and components',
'admin.kerberos.disable.step1.task0.title': 'Stop Services',
- 'admin.kerberos.disable.step1.task1.title': 'Remove Kerberos',
- 'admin.kerberos.disable.step1.task2.title': 'Start Services',
+ 'admin.kerberos.disable.step1.task1.title': 'Unkerberize Cluster',
+ 'admin.kerberos.disable.step1.task2.title': 'Remove Kerberos',
+ 'admin.kerberos.disable.step1.task3.title': 'Start Services',
'admin.kerberos.disable.unkerberize.header': 'Unkerberize cluster',
'admin.kerberos.disable.unkerberize.message': 'You cannot quit wizard while cluster is being unkerberized',
'admin.kerberos.disable.inProgress': 'Please wait while cluster is being unkerberized',
[2/2] ambari git commit: AMBARI-9862. Keytab field is not shown
correctly (alexantonenko)
Posted by al...@apache.org.
AMBARI-9862. Keytab field is not shown correctly (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f20500b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f20500b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f20500b2
Branch: refs/heads/trunk
Commit: f20500b272479df261efc1b7586fb2ba4cf8ae5c
Parents: 8793f44
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Mar 2 20:09:41 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Mar 2 21:18:25 2015 +0200
----------------------------------------------------------------------
.../app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js | 1 +
.../app/scripts/controllers/ambariViews/ViewsEditCtrl.js | 3 +++
.../main/resources/ui/admin-web/app/views/ambariViews/create.html | 2 +-
.../main/resources/ui/admin-web/app/views/ambariViews/edit.html | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
index 71a21a7..41d49d3 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js
@@ -31,6 +31,7 @@ angular.module('ambariAdminConsole')
angular.forEach(parameters, function (item) {
item.value = item['defaultValue'];
+ item.displayName = item.name.replace(/\./g, '\.\u200B');
});
$scope.instance = {
http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
index 96696a0..8e720a6 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
@@ -53,6 +53,9 @@ angular.module('ambariAdminConsole')
// Get META for properties
View.getMeta($routeParams.viewId, $routeParams.version).then(function(data) {
$scope.configurationMeta = data.data.ViewVersionInfo.parameters;
+ angular.forEach($scope.configurationMeta, function (item) {
+ item.displayName = item.name.replace(/\./g, '\.\u200B');
+ });
reloadViewInfo();
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
index eee6ff3..db0443f 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html
@@ -100,7 +100,7 @@
<div class="panel-body property-form">
<div class="form-group" ng-repeat="parameter in instance.properties"
ng-class="{'has-error' : ((form.instanceCreateForm[parameter.name].$error.required && form.instanceCreateForm.submitted) || form.instanceCreateForm[parameter.name].validationError)}" >
- <label for="" class="col-sm-3 control-label" ng-class="{'not-required': !parameter.required}">{{parameter.label || parameter.name}}{{parameter.required ? '*' : ''}}</label>
+ <label for="" class="col-sm-3 control-label" ng-class="{'not-required': !parameter.required}">{{parameter.label || parameter.displayName}}{{parameter.required ? '*' : ''}}</label>
<div ng-switch="parameter.type">
<div class="col-sm-9 checkbox" ng-switch-when="boolean">
<input type="checkbox" class="viewproperty-input" name="{{parameter.name}}" ng-required="parameter.required" ng-model="parameter.value" popover="{{parameter.description}}" popover-title="{{parameter.name}}" popover-trigger="mouseenter">
http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index 4d9591f..bf14adf 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -137,7 +137,7 @@
<form name="propertiesForm" class="form-horizontal property-form" ng-hide="isConfigurationEmpty" novalidate>
<fieldset>
<div class="form-group" ng-repeat="property in configurationMeta" ng-class="{'has-error' : (!editConfigurationDisabled && ((property.required && propertiesForm[property.name].$error.required && !editConfigurationDisabled) || propertiesForm[property.name].validationError))}">
- <label for="" class="control-label col-sm-3" ng-class="{'not-required': !property.required}">{{property.label || property.name}}{{property.required ? '*' : ''}}</label>
+ <label for="" class="control-label col-sm-3" ng-class="{'not-required': !property.required}">{{property.label || property.displayName}}{{property.required ? '*' : ''}}</label>
<div ng-switch="property.type">
<div class="col-sm-9 checkbox" ng-switch-when="boolean">
<input type="checkbox" class="propertie-input" ng-disabled="editConfigurationDisabled" name="{{property.name}}" ng-model="configuration[property.name]" ng-true-value="true" ng-false-value="false" popover="{{property.description}}" popover-title="{{property.name}}" popover-trigger="mouseenter">