You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/10/25 02:36:17 UTC
[2/4] AMBARI-7963. Remove experimental flag for the features that are
already part of ambari. (jaimin)
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index 0464067..0ff2177 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -374,7 +374,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
}, this)
},
/**
- * Map quick links to services:OOZIE,GANGLIA,NAGIOS,HUE
+ * Map quick links to services:OOZIE,GANGLIA,NAGIOS
* @param finalJson
* @param item
*/
@@ -384,7 +384,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
OOZIE: [19],
GANGLIA: [20],
NAGIOS: [21],
- HUE: [22],
STORM: [31],
FALCON: [32]
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/mappers/stack_service_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/stack_service_mapper.js b/ambari-web/app/mappers/stack_service_mapper.js
index 6a13bd3..73e866f 100644
--- a/ambari-web/app/mappers/stack_service_mapper.js
+++ b/ambari-web/app/mappers/stack_service_mapper.js
@@ -77,23 +77,20 @@ App.stackServiceMapper = App.QuickDataMapper.create({
var stackServiceComponents = [];
this.rearrangeServicesForDisplayOrder(json.items, App.StackService.displayOrder);
json.items.forEach(function (item) {
- //@TODO: Remove the condition when Flume becomes supported service in any stack
- if (item.StackServices.service_name !== 'FLUME' || App.supports.flume) {
- var stackService = item.StackServices;
- var serviceComponents = [];
- item.serviceComponents.forEach(function (serviceComponent) {
- var dependencies = serviceComponent.dependencies.map(function(dependecy) {
- return { Dependencies: App.keysUnderscoreToCamelCase(App.permit(dependecy.Dependencies, ['component_name', 'scope'])) };
- });
- serviceComponent.StackServiceComponents.id = serviceComponent.StackServiceComponents.component_name;
- serviceComponent.StackServiceComponents.dependencies = dependencies;
- serviceComponents.push(serviceComponent.StackServiceComponents);
- stackServiceComponents.push(this.parseIt(serviceComponent.StackServiceComponents, this.get('component_config')));
- }, this);
- stackService.stack_id = stackService.stack_name + '-' + stackService.stack_version;
- stackService.service_components = serviceComponents;
- result.push(this.parseIt(stackService, this.get('config')));
- }
+ var stackService = item.StackServices;
+ var serviceComponents = [];
+ item.serviceComponents.forEach(function (serviceComponent) {
+ var dependencies = serviceComponent.dependencies.map(function (dependecy) {
+ return { Dependencies: App.keysUnderscoreToCamelCase(App.permit(dependecy.Dependencies, ['component_name', 'scope'])) };
+ });
+ serviceComponent.StackServiceComponents.id = serviceComponent.StackServiceComponents.component_name;
+ serviceComponent.StackServiceComponents.dependencies = dependencies;
+ serviceComponents.push(serviceComponent.StackServiceComponents);
+ stackServiceComponents.push(this.parseIt(serviceComponent.StackServiceComponents, this.get('component_config')));
+ }, this);
+ stackService.stack_id = stackService.stack_name + '-' + stackService.stack_version;
+ stackService.service_components = serviceComponents;
+ result.push(this.parseIt(stackService, this.get('config')));
}, this);
App.store.loadMany(this.get('component_model'), stackServiceComponents);
App.store.loadMany(model, result);
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index e3e265c..99a429c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -629,8 +629,6 @@ Em.I18n.translations = {
'installer.step6.wizardStep6Host.title':'master components hosted on {0}',
'installer.step6.addHostWizard.body':'Assign HBase master and ZooKeeper server.',
'installer.step6.error.mustSelectOneForSlaveHost': 'You must assign at least one slave/client component to each host with no master component',
- 'installer.step6.validationIssuesAttention.header': 'Validation Issues',
- 'installer.step6.validationIssuesAttention': 'Slave and Client component assignments have issues that need attention.',
'installer.step6.validationSlavesAndClients.hasIssues': 'Your slave and client assignment has issues. ',
'installer.step6.validationSlavesAndClients.click': 'Click',
'installer.step6.validationSlavesAndClients.forDetails': ' for details.',
@@ -1586,8 +1584,6 @@ Em.I18n.translations = {
'services.oozie.clients': 'Oozie Clients',
'services.oozie.webUi': 'Oozie Web UI',
- 'services.hue.webUi': 'Hue Web UI',
-
'services.ganglia.webUi': 'Ganglia Web UI',
'services.ganglia.monitors': 'Ganglia Monitors',
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/mixins/common/serverValidator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/serverValidator.js b/ambari-web/app/mixins/common/serverValidator.js
index ca1367f..4eccf37 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -99,7 +99,7 @@ App.ServerValidatorMixin = Em.Mixin.create({
* @returns {*}
*/
loadServerSideConfigsRecommendations: function() {
- if (this.get('recommendationsConfigs') || !App.get('supports.serverRecommendValidate')) {
+ if (this.get('recommendationsConfigs')) {
return $.Deferred().resolve();
}
return App.ajax.send({
@@ -136,15 +136,11 @@ App.ServerValidatorMixin = Em.Mixin.create({
serverSideValidation: function () {
var deferred = $.Deferred();
- if (!App.get('supports.serverRecommendValidate')) {
- deferred.resolve();
+ this.set('configValidationFailed', false);
+ if (this.get('configValidationFailed')) {
+ this.warnUser(deferred);
} else {
- this.set('configValidationFailed', false);
- if (this.get('configValidationFailed')) {
- this.warnUser(deferred);
- } else {
- this.runServerSideValidation(deferred);
- }
+ this.runServerSideValidation(deferred);
}
return deferred;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/models.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models.js b/ambari-web/app/models.js
index c127515..130f526 100644
--- a/ambari-web/app/models.js
+++ b/ambari-web/app/models.js
@@ -51,8 +51,6 @@ require('models/background_operation');
require('models/client_component');
require('models/host_component');
require('models/target_cluster');
-require('models/dataset');
-require('models/dataset_job');
require('models/slave_component');
require('classes/run_class');
require('classes/job_class');
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 2da22e7..a4d6f5e 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -282,13 +282,6 @@ App.QuickLinks.FIXTURES = [
template:'%@://%@/nagios'
},
{
- id:22,
- label:'Hue Web UI',
- url:'%@://%@/hue',
- service_id: 'HUE',
- template:'%@://%@/hue'
- },
- {
id:23,
label:'ResourceManager UI',
url:'%@://%@:%@',
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 2d15301..ae1c3ee 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -450,9 +450,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'webhcatserver_host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'WEBHCAT_SERVER').hostName);
break;
- case 'hueserver_host':
- this.set('value', masterComponentHostsInDB.findProperty('component', 'HUE_SERVER').hostName);
- break;
case 'oozie_ambari_host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'OOZIE_SERVER').hostName);
break;
@@ -886,16 +883,6 @@ App.ServiceConfigProperty = Ember.Object.extend({
}
}
}
- if (!App.get('supports.serverRecommendValidate')) {
- var serviceValidator = this.get('serviceValidator');
- if (serviceValidator!=null) {
- var validationIssue = serviceValidator.validateConfig(this);
- if (validationIssue) {
- this.set('warnMessage', validationIssue);
- isWarn = true;
- }
- }
- }
if (!isWarn || isError) { // Errors get priority
this.set('warnMessage', '');
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index 4c86b20..6d7b61d 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -189,7 +189,6 @@ App.StackService.displayOrder = [
'SQOOP',
'OOZIE',
'ZOOKEEPER',
- 'HUE',
'FALCON',
'STORM',
'FLUME'
@@ -252,7 +251,7 @@ App.StackService.configCategories = function () {
App.ServiceConfigCategory.create({ name: 'NODEMANAGER', displayName: 'Node Manager'}),
App.ServiceConfigCategory.create({ name: 'APP_TIMELINE_SERVER', displayName: 'Application Timeline Server'}),
App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
- App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName: 'Scheduler', isCustomView: true, siteFileName: 'capacity-scheduler.xml'})
+ App.ServiceConfigCategory.create({ name: 'CapacityScheduler', displayName: 'Scheduler', siteFileName: 'capacity-scheduler.xml'})
]);
break;
case 'MAPREDUCE2':
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/models/stack_service_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js
index d88f02a..46c006e 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -168,12 +168,6 @@ App.StackServiceComponent = DS.Model.extend({
return this.get('minToInstall') == Infinity;
}.property('stackService','isSlave'),
- /** components that are not to be installed with ambari server **/
- isNotPreferableOnAmbariServerHost: function() {
- var service = ['STORM_UI_SERVER', 'DRPC_SERVER', 'STORM_REST_API', 'NIMBUS', 'GANGLIA_SERVER', 'NAGIOS_SERVER', 'HUE_SERVER'];
- return service.contains(this.get('componentName'));
- }.property('componentName'),
-
/** @property {Number} defaultNoOfMasterHosts - default number of master hosts on Assign Master page: **/
defaultNoOfMasterHosts: function() {
if (this.get('isMasterAddableInstallerWizard')) {
@@ -181,10 +175,6 @@ App.StackServiceComponent = DS.Model.extend({
}
}.property('componentName'),
- selectionSchemeForMasterComponent: function() {
- return App.StackServiceComponent.selectionScheme(this.get('componentName'));
- }.property('componentName'),
-
/** @property {Boolean} coHostedComponents - components that are co-hosted with this component **/
coHostedComponents: function() {
var componentName = this.get('componentName');
@@ -212,31 +202,6 @@ App.StackServiceComponent = DS.Model.extend({
App.StackServiceComponent.FIXTURES = [];
-App.StackServiceComponent.selectionScheme = function (componentName){
- switch (componentName) {
- case 'NAMENODE' :
- return {"else": 0};
- case 'SECONDARY_NAMENODE' :
- return {"else": 1};
- case 'HBASE_MASTER':
- return {"6": 0, "31": 2, "else": 3};
- case 'JOBTRACKER':
- case 'HISTORYSERVER':
- case 'RESOURCEMANAGER':
- case 'APP_TIMELINE_SERVER':
- return {"31": 1, "else": 2};
- case 'OOZIE_SERVER':
- case 'FALCON_SERVER' :
- return {"6": 1, "31": 2, "else": 3};
- case 'HIVE_SERVER' :
- case 'HIVE_METASTORE' :
- case 'WEBHCAT_SERVER' :
- return {"6": 1, "31": 2, "else": 4};
- default:
- return {"else": 0};
- }
-};
-
App.StackServiceComponent.coHost = {
'HIVE_METASTORE': 'HIVE_SERVER',
'WEBHCAT_SERVER': 'HIVE_SERVER'
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/models/user.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/user.js b/ambari-web/app/models/user.js
index f51d07c..cd952a0 100644
--- a/ambari-web/app/models/user.js
+++ b/ambari-web/app/models/user.js
@@ -67,7 +67,7 @@ App.EditUserForm = App.Form.extend({
disableAdminCheckbox:function () {
var object = this.get('object');
if (object) {
- if ((object.get('userName') == App.get('router').getLoginName()) || App.get('supports.ldapGroupMapping') && object.get("isLdap")) {
+ if (object.get('userName') == App.get('router').getLoginName()) {
this.getField("admin").set("disabled", true);
} else {
this.getField("admin").set("disabled", false);
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/routes/add_host_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_host_routes.js b/ambari-web/app/routes/add_host_routes.js
index ff281a9..e5e92b3 100644
--- a/ambari-web/app/routes/add_host_routes.js
+++ b/ambari-web/app/routes/add_host_routes.js
@@ -197,11 +197,7 @@ module.exports = App.WizardRoute.extend({
wizardStep6Controller.callValidation(function() {
wizardStep6Controller.showValidationIssuesAcceptBox(function() {
addHostController.saveSlaveComponentHosts(wizardStep6Controller);
- if(App.supports.hostOverrides){
- router.transitionTo('step4');
- }else{
- router.transitionTo('step5');
- }
+ router.transitionTo('step4');
});
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index 4e4b83e..73485b9 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -211,9 +211,7 @@ module.exports = App.WizardRoute.extend({
var addServiceController = router.get('addServiceController');
var wizardStep7Controller = router.get('wizardStep7Controller');
addServiceController.saveServiceConfigProperties(wizardStep7Controller);
- if (App.supports.hostOverrides) {
- addServiceController.saveServiceConfigGroups(wizardStep7Controller, true);
- }
+ addServiceController.saveServiceConfigGroups(wizardStep7Controller, true);
router.transitionTo('step5');
}
}),
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 9fc3d39..eb38a5c 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -323,9 +323,7 @@ module.exports = Em.Route.extend({
var controller = router.get('installerController');
var wizardStep7Controller = router.get('wizardStep7Controller');
controller.saveServiceConfigProperties(wizardStep7Controller);
- if (App.supports.hostOverridesInstaller) {
- controller.saveServiceConfigGroups(wizardStep7Controller);
- }
+ controller.saveServiceConfigGroups(wizardStep7Controller);
controller.setDBProperty('recommendationsConfigs', wizardStep7Controller.get('recommendationsConfigs'));
router.transitionTo('step8');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 25f1714..bfdfc8c 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -140,12 +140,8 @@ module.exports = Em.Route.extend({
configHistory: Em.Route.extend({
route: '/config_history',
connectOutlets: function (router, context) {
- if (App.get('supports.configHistory')) {
- router.set('mainDashboardController.selectedCategory', 'configHistory');
- router.get('mainDashboardController').connectOutlet('mainConfigHistory');
- } else {
- router.transitionTo('main.dashboard.widgets');
- }
+ router.set('mainDashboardController.selectedCategory', 'configHistory');
+ router.get('mainDashboardController').connectOutlet('mainConfigHistory');
}
}),
goToServiceConfigs: function (router, event) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/common/configs/capacity_scheduler.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/capacity_scheduler.hbs b/ambari-web/app/templates/common/configs/capacity_scheduler.hbs
deleted file mode 100644
index 6ccd55f..0000000
--- a/ambari-web/app/templates/common/configs/capacity_scheduler.hbs
+++ /dev/null
@@ -1,101 +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.
-}}
-
-<div class="accordion-heading" {{action "onToggleBlock" view.category target="view"}}>
- <i class="pull-left accordion-toggle" {{bindAttr class="view.category.isCollapsed:icon-caret-right:icon-caret-down "}}></i>
- <a class="accordion-toggle">{{view.category.displayName}}</a>
-</div>
-
-<div {{bindAttr id="view.category.name"}} class="accordion-body collapse in">
- <div class="accordion-inner capacity-scheduler">
- <div class="row-fluid header">
- <div class="span1">{{t services.mapReduce.config.queue.header}}</div>
- <div class="offset9 span2">
- {{#if view.canEdit}}
- <div class="btn pull-right" {{action queuePopup target="view"}}>{{t services.mapReduce.config.addQueue}}</div>
- {{/if}}
- </div>
- </div>
- <div>
- <table class="table table-bordered table-striped">
- <thead>
- <tr>
- {{#each header in view.tableHeaders}}
- <th>{{header}}</th>
- {{/each}}
- </tr>
- </thead>
- <tbody>
- {{#each queue in view.tableContent}}
- <tr {{action queuePopup queue.name target="view"}}>
- <td><a href="javascript:void(0)">
- <i {{bindAttr style="queue.color"}} class="marker"></i>{{queue.name}}</a>
- </td>
- {{#each config in queue.configs}}
- <td>{{config.value}}</td>
- {{/each}}
- </tr>
- {{/each}}
- </tbody>
- </table>
- </div>
- <div class="row-fluid">
- <div class="span8">
- <div><strong>{{t common.advanced}}</strong></div>
- <form class="form-horizontal" autocomplete="off">
- {{#each view.advancedConfigs}}
- {{#if isVisible}}
- <div class="row-fluid">
- <div {{bindAttr class="errorMessage:error :control-label-span :span4"}}>
- <label>{{displayName}}</label>
- </div>
- <div class="span8">
- <div {{bindAttr class="errorMessage:error: :control-group"}}>
- {{view viewClass serviceConfigBinding="this" categoryConfigsBinding="view.categoryConfigs" }}
- {{#if view.canEdit}}
- {{#if App.isAdmin}}
- {{#if isRemovable}}
- <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
- {{/if}}
- {{/if}}
- {{/if}}
- <span class="help-inline">{{errorMessage}}</span>
- </div>
- </div>
- </div>
- {{/if}}
- {{/each}}
- </form>
- </div>
- <div class="span4">
- <div class="frame">
- <div id="section_label"></div>
- {{view view.pieChart queuesBinding="view.queues"}}
- </div>
- </div>
- </div>
- {{! For Advanced, Advanced Core Site, Advanced HDFS Site sections, show the 'Add Property' link.}}
- {{#if view.canEdit}}
- {{#if view.category.customCanAddProperty }}
- <div>
- <a href="#" {{action "showAddPropertyWindow" this target="view" }} >{{t installer.step7.config.addProperty}}...</a>
- </div>
- {{/if}}
- {{/if}}
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/common/configs/service_config.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs
index 14bcd30..260b9c1 100644
--- a/ambari-web/app/templates/common/configs/service_config.hbs
+++ b/ambari-web/app/templates/common/configs/service_config.hbs
@@ -84,13 +84,9 @@
{{#if versionLoaded}}
<div class="accordion">
{{#each category in selectedService.configCategories}}
- {{#if category.isCustomView}}
- {{#if App.supports.capacitySchedulerUi}}
- {{view category.customView categoryBinding="category" serviceBinding="selectedService" canEditBinding="view.canEdit" serviceConfigsBinding="selectedService.configs"}}
- {{/if}}
- {{else}}
+ {{#unless category.isCustomView}}
{{view App.ServiceConfigsByCategoryView categoryBinding="category" canEditBinding="view.canEdit" serviceBinding="selectedService" serviceConfigsBinding="selectedService.configs" supportsHostOverridesBinding="view.supportsHostOverrides"}}
- {{/if}}
+ {{/unless}}
{{/each}}
</div>
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/common/configs/service_config_category.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs
index 0aaf35f..a03c9af 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -31,14 +31,14 @@
<span {{bindAttr class="errorMessage:error: :control-group :control-label-span"}}>
<label class="control-label">
{{formatWordBreak displayName}}
- {{#if App.supports.secureCluster}}
- {{#if isSecureConfig}}
- <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip" title="security knob"></i></a>
- {{/if}}
+ {{#if isSecureConfig}}
+ <a href="javascript:void(null);"><i class="icon-lock" rel="tooltip" data-toggle="tooltip"
+ title="security knob"></i></a>
{{/if}}
{{#if view.supportsHostOverrides}}
{{#if isRestartRequired}}
- <i class="icon-refresh restart-required-property" rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
+ <i class="icon-refresh restart-required-property"
+ rel="tooltip" {{bindAttr title="restartRequiredMessage"}}></i>
{{/if}}
{{/if}}
</label>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/common/host_progress_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs
index a80cd65..01008f3 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -18,60 +18,59 @@
<div class="host-component-popup-wrap">
- {{#if view.parentView.isLoaded}}
- {{!-- SERVICES --}}
-
- <div {{bindAttr class="view.parentView.isServiceListHidden:hidden :task-list-main-warp"}}>
- <div class="task-top-wrap">
- <div class="operation-name-top">{{t common.operations}}</div>
- <div class="start-time-top">{{t common.startTime}}</div>
- <div class="duration-top">{{t common.duration}}</div>
- <div class="select-wrap">
- {{t common.show}}:
- {{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.serviceCategory"
- }}
- </div>
+{{#if view.parentView.isLoaded}}
+{{!-- SERVICES --}}
+
+ <div {{bindAttr class="view.parentView.isServiceListHidden:hidden :task-list-main-warp"}}>
+ <div class="task-top-wrap">
+ <div class="operation-name-top">{{t common.operations}}</div>
+ <div class="start-time-top">{{t common.startTime}}</div>
+ <div class="duration-top">{{t common.duration}}</div>
+ <div class="select-wrap">
+ {{t common.show}}:
+ {{view Ember.Select
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.serviceCategory"
+ }}
</div>
- <div id="service-info">
- {{#if view.isServiceEmptyList}}
- <div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
- {{else}}
- {{#each servicesInfo in view.services}}
- <div {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
- <div {{action gotoHosts servicesInfo}} class="task-list-line-cursor">
- <div class="operation-name-icon-wrap">
- {{view statusIcon servicesInfoBinding="servicesInfo"}}
- <a href="#">
- {{servicesInfo.name}}
- </a>
- {{#if App.supports.abortRequests}}
- {{#if servicesInfo.isAbortable}}
- {{view abortIcon servicesInfoBinding="servicesInfo"}}
- {{/if}}
- {{/if}}
- </div>
- <div class="time-summary start-time-text">{{servicesInfo.startTime}}</div>
- <div class="time-summary duration-text">{{servicesInfo.duration}}</div>
- <div class="progress-bar span2">
- <div {{bindAttr class="servicesInfo.isInProgress:progress-striped servicesInfo.isInProgress:active servicesInfo.barColor :progress"}}>
- <div class="bar" {{bindAttr style="servicesInfo.barWidth"}}></div>
- </div>
+ </div>
+ <div id="service-info">
+ {{#if view.isServiceEmptyList}}
+ <div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
+ {{else}}
+ {{#each servicesInfo in view.services}}
+ <div {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
+ <div {{action gotoHosts servicesInfo}} class="task-list-line-cursor">
+ <div class="operation-name-icon-wrap">
+ {{view statusIcon servicesInfoBinding="servicesInfo"}}
+ <a href="#">
+ {{servicesInfo.name}}
+ </a>
+ {{#if servicesInfo.isAbortable}}
+ {{view abortIcon servicesInfoBinding="servicesInfo"}}
+ {{/if}}
+ </div>
+ <div class="time-summary start-time-text">{{servicesInfo.startTime}}</div>
+ <div class="time-summary duration-text">{{servicesInfo.duration}}</div>
+ <div class="progress-bar span2">
+ <div {{bindAttr class="servicesInfo.isInProgress:progress-striped servicesInfo.isInProgress:active servicesInfo.barColor :progress"}}>
+ <div class="bar" {{bindAttr style="servicesInfo.barWidth"}}></div>
</div>
- <div class="host-progress-num">{{servicesInfo.progress}}%</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
</div>
+ <div class="host-progress-num">{{servicesInfo.progress}}%</div>
+ <div class="show-details"><i class="icon-caret-right"></i></div>
</div>
- {{/each}}
- {{/if}}
- {{#if view.isShowMore}}
- <div class="show-more" {{action requestMoreOperations}}><a href="#">{{t hostPopup.serviceInfo.showMore}}</a></div>
- {{/if}}
- </div>
+ </div>
+ {{/each}}
+ {{/if}}
+ {{#if view.isShowMore}}
+ <div class="show-more" {{action requestMoreOperations}}><a href="#">{{t hostPopup.serviceInfo.showMore}}</a>
+ </div>
+ {{/if}}
</div>
+ </div>
{{!-- HOSTS ---}}
@@ -83,14 +82,15 @@
<i class="icon-arrow-left"></i> {{t common.operations}}
</a>
{{/if}}
- <span class="task-detail-log-rolename" >{{t common.hosts}}</span>
+ <span class="task-detail-log-rolename">{{t common.hosts}}</span>
+
<div class="select-wrap">
{{t common.show}}:
{{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.hostCategory"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.hostCategory"
}}
</div>
</div>
@@ -111,31 +111,31 @@
{{/if}}
{{/if}}
{{#if view.isLevelLoaded}}
- <div id="host-info" {{bindAttr class="view.isRequestSchedule:scheduled"}}>
- {{#if view.isHostEmptyList}}
- <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
- {{else}}
- {{#each hostInfo in view.pageContent}}
- <div {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
- <div {{action gotoTasks hostInfo}} class="task-list-line-cursor">
- <div class="host-name-icon-wrap">
- {{view statusIcon servicesInfoBinding="hostInfo"}}
- <a href="#">
- {{hostInfo.displayName}}
- </a>
- </div>
- <div class="progress-bar span2">
- <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
- <div class="bar" {{bindAttr style="hostInfo.barWidth"}}></div>
- </div>
- </div>
- <div class="host-progress-num">{{hostInfo.progress}}%</div>
- <div class="show-details"><i class="icon-caret-right"></i></div>
- </div>
+ <div id="host-info" {{bindAttr class="view.isRequestSchedule:scheduled"}}>
+ {{#if view.isHostEmptyList}}
+ <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
+ {{else}}
+ {{#each hostInfo in view.pageContent}}
+ <div {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
+ <div {{action gotoTasks hostInfo}} class="task-list-line-cursor">
+ <div class="host-name-icon-wrap">
+ {{view statusIcon servicesInfoBinding="hostInfo"}}
+ <a href="#">
+ {{hostInfo.displayName}}
+ </a>
</div>
- {{/each}}
- {{/if}}
- </div>
+ <div class="progress-bar span2">
+ <div {{bindAttr class="hostInfo.isInProgress:progress-striped :active hostInfo.barColor :progress"}}>
+ <div class="bar" {{bindAttr style="hostInfo.barWidth"}}></div>
+ </div>
+ </div>
+ <div class="host-progress-num">{{hostInfo.progress}}%</div>
+ <div class="show-details"><i class="icon-caret-right"></i></div>
+ </div>
+ </div>
+ {{/each}}
+ {{/if}}
+ </div>
{{else}}
<div class="spinner"></div>
{{/if}}
@@ -146,15 +146,17 @@
<div {{bindAttr class="view.parentView.isTaskListHidden:hidden :task-list-main-warp"}}>
<div class="task-top-wrap">
- <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToHostList}} ><i class="icon-arrow-left"></i> {{t common.hosts}}</a>
+ <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToHostList}} ><i
+ class="icon-arrow-left"></i> {{t common.hosts}}</a>
+
<div class="task-name-top task-detail-log-rolename">{{t common.tasks}}</div>
<div class="select-wrap tasks-list-select">
{{t common.show}}:
{{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.taskCategory"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.taskCategory"
}}
</div>
</div>
@@ -184,54 +186,60 @@
<div {{bindAttr class="view.parentView.isLogWrapHidden:hidden :task-detail-info"}}>
<div class="task-top-wrap">
- <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i class="icon-arrow-left"></i> {{t common.tasks}}</a>
+ <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i
+ class="icon-arrow-left"></i> {{t common.tasks}}</a>
+
<div>
<i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
+
<div class="task-detail-ico-wrap">
- <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i class="icon-copy"></i> {{t common.copy}}</a>
- <a title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i class="icon-external-link"></i> {{t common.open}}</a>
+ <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
+ class="icon-copy"></i> {{t common.copy}}</a>
+ <a title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
+ class="icon-external-link"></i> {{t common.open}}</a>
</div>
- <span class="task-detail-log-rolename" >{{view.openedTask.commandDetail}}</span>
+ <span class="task-detail-log-rolename">{{view.openedTask.commandDetail}}</span>
</div>
</div>
{{#if view.isLevelLoaded}}
- <div class="task-detail-log-info">
- <div class="content-area">
- <div class="task-detail-log-clipboard-wrap"></div>
- <div class="task-detail-log-maintext">
- {{#if view.openedTask.isRebalanceHDFSTask }}
- <h5>{{t services.hdfs.rebalance.title}}</h5>
- <div class="progresspopup-rebalancehdfs">
- <div {{bindAttr class=":progress view.openedTask.isInProgress:progress-striped view.openedTask.barColor :active"}}>
- <div class="bar" {{bindAttr style="view.openedTask.completionProgressStyle"}}></div>
- </div>
- </div>
- <div class="clearfix">
- <div class="pull-left">
- {{view.openedTask.dataMoved}} moved /
- {{view.openedTask.dataLeft}} left /
- {{view.openedTask.dataBeingMoved}} being processed
- </div>
- {{#if view.openedTask.isNotComplete}}
- <button class="btn btn-danger pull-right" {{action stopRebalanceHDFS}}>{{t common.cancel}}</button>
- {{/if}}
- </div>
- <hr>
- {{/if}}
- <h5>stderr: <span class="muted">{{view.openedTask.errorLog}} </span></h5>
- <pre class="stderr">{{view.openedTask.stderr}}</pre>
- <h5>stdout: <span class="muted"> {{view.openedTask.outputLog}} </span></h5>
- <pre class="stdout">{{view.openedTask.stdout}}</pre>
+ <div class="task-detail-log-info">
+ <div class="content-area">
+ <div class="task-detail-log-clipboard-wrap"></div>
+ <div class="task-detail-log-maintext">
+ {{#if view.openedTask.isRebalanceHDFSTask }}
+ <h5>{{t services.hdfs.rebalance.title}}</h5>
+
+ <div class="progresspopup-rebalancehdfs">
+ <div {{bindAttr class=":progress view.openedTask.isInProgress:progress-striped view.openedTask.barColor :active"}}>
+ <div class="bar" {{bindAttr style="view.openedTask.completionProgressStyle"}}></div>
</div>
- </div>
+ </div>
+ <div class="clearfix">
+ <div class="pull-left">
+ {{view.openedTask.dataMoved}} moved /
+ {{view.openedTask.dataLeft}} left /
+ {{view.openedTask.dataBeingMoved}} being processed
+ </div>
+ {{#if view.openedTask.isNotComplete}}
+ <button class="btn btn-danger pull-right" {{action stopRebalanceHDFS}}>{{t common.cancel}}</button>
+ {{/if}}
+ </div>
+ <hr>
+ {{/if}}
+ <h5>stderr: <span class="muted">{{view.openedTask.errorLog}} </span></h5>
+ <pre class="stderr">{{view.openedTask.stderr}}</pre>
+ <h5>stdout: <span class="muted"> {{view.openedTask.outputLog}} </span></h5>
+ <pre class="stdout">{{view.openedTask.stdout}}</pre>
+ </div>
</div>
+ </div>
{{else}}
<div class="spinner"></div>
{{/if}}
</div>
- {{else}}
- <div class="spinner"></div>
- {{/if}}
+{{else}}
+ <div class="spinner"></div>
+{{/if}}
</div>
{{#if view.isPaginate}}
<div class="page-bar pull-right no-borders mtm">
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/main/host/add.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/add.hbs b/ambari-web/app/templates/main/host/add.hbs
index 8d35a9a..745ebd7 100644
--- a/ambari-web/app/templates/main/host/add.hbs
+++ b/ambari-web/app/templates/main/host/add.hbs
@@ -31,9 +31,7 @@
<li {{bindAttr class="isStep1:active view.isStep1Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep1 target="controller"}}>{{t installer.step2.header}}</a></li>
<li {{bindAttr class="isStep2:active view.isStep2Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep2 target="controller"}}>{{t installer.step3.header}}</a></li>
<li {{bindAttr class="isStep3:active view.isStep3Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep3 target="controller"}}>{{t installer.step6.header}}</a></li>
- {{#if App.supports.hostOverrides}}
- <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep4 target="controller"}}>{{t addHost.step4.header}}</a></li>
- {{/if}}
+ <li {{bindAttr class="isStep4:active view.isStep4Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep4 target="controller"}}>{{t addHost.step4.header}}</a></li>
<li {{bindAttr class="isStep5:active view.isStep5Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep5 target="controller"}}>{{t installer.step8.header}}</a></li>
<li {{bindAttr class="isStep6:active view.isStep6Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep6 target="controller"}}>{{t installer.step9.header}}</a></li>
<li {{bindAttr class="isStep7:active view.isStep7Disabled:disabled"}}><a href="javascript:void(null);" {{action gotoStep7 target="controller"}}>{{t installer.step10.header}}</a></li>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/main/host/details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details.hbs b/ambari-web/app/templates/main/host/details.hbs
index ecd4a63..860b4dc 100644
--- a/ambari-web/app/templates/main/host/details.hbs
+++ b/ambari-web/app/templates/main/host/details.hbs
@@ -17,60 +17,60 @@
}}
{{#if view.isLoaded}}
- <div id="host-details">
- <div class="status-info">
- <span rel="HealthTooltip" {{bindAttr class="view.content.healthClass view.content.healthIconClass"}} {{bindAttr data-original-title="view.content.healthToolTip" }}></span><span class='host-title'>{{unbound view.content.publicHostName}}</span>
- {{#if view.content.criticalAlertsCount}}
- <span class="label label-important alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{view.content.criticalAlertsCount}}</span>
- {{else}}
- <span class="label label-success alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{t hosts.host.alert.noAlerts}}</span>
- {{/if}}
- {{#unless view.isActive}}
- <span class="host-maintenance-notice pull-right"><span class="icon-medkit"></span> {{t hosts.host.passive.mode}}</span>
- {{/unless}}
- </div>
- <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i class="icon-arrow-left"></i> {{t common.back}}</a></div>
- <div class="content">
- {{view App.MainHostMenuView}}
- {{#if App.isAdmin}}
- {{#if App.supports.deleteHost}}
- <div class="service-button">
- <div class="btn-group display-inline-block">
- <a href="javascript:void(null)" {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown">
- {{t hosts.host.details.hostActions}}
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu pull-right">
- <!-- dropdown menu links -->
- {{#each option in view.maintenance}}
- <li {{bindAttr class="controller.isStopDisabled:disabled option.liClass"}}>
- <a {{action "doAction" option target="controller" href=true}}><i {{bindAttr class="option.cssClass option.liClass"}}></i> {{option.label}}</a>
- </li>
- {{/each}}
- {{#if App.supports.downloadClientConfigs}}
- {{#if view.clients}}
- <li class="dropdown-submenu submenu-left">
- <a><i class="icon-download-alt"></i> {{t services.service.actions.downloadClientConfigs}}</a>
- <div class="dropdown-menu-wrap">
- <ul class="dropdown-menu">
- {{#each client in view.clientsWithConfigs}}
- <li>
- <a {{action "downloadClientConfigs" client target="controller" href=true}}>{{client.displayName}}</a>
- </li>
- {{/each}}
- </ul>
- </div>
- </li>
- {{/if}}
- {{/if}}
- </ul>
- </div>
- </div>
- {{/if}}
- {{/if}}
- {{outlet}}
+ <div id="host-details">
+ <div class="status-info">
+ <span rel="HealthTooltip" {{bindAttr class="view.content.healthClass view.content.healthIconClass"}} {{bindAttr data-original-title="view.content.healthToolTip" }}></span><span
+ class='host-title'>{{unbound view.content.publicHostName}}</span>
+ {{#if view.content.criticalAlertsCount}}
+ <span class="label label-important alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{view.content.criticalAlertsCount}}</span>
+ {{else}}
+ <span class="label label-success alerts-count" {{action "showAlertsPopup" content target="App.router.mainHostController"}}>{{t hosts.host.alert.noAlerts}}</span>
+ {{/if}}
+ {{#unless view.isActive}}
+ <span class="host-maintenance-notice pull-right"><span class="icon-medkit"></span> {{t hosts.host.passive.mode}}</span>
+ {{/unless}}
+ </div>
+ <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i
+ class="icon-arrow-left"></i> {{t common.back}}</a></div>
+ <div class="content">
+ {{view App.MainHostMenuView}}
+ {{#if App.isAdmin}}
+ <div class="service-button">
+ <div class="btn-group display-inline-block">
+ <a href="javascript:void(null)" {{bindAttr class=":btn :dropdown-toggle"}} data-toggle="dropdown">
+ {{t hosts.host.details.hostActions}}
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu pull-right">
+ <!-- dropdown menu links -->
+ {{#each option in view.maintenance}}
+ <li {{bindAttr class="controller.isStopDisabled:disabled option.liClass"}}>
+ <a {{action "doAction" option target="controller" href=true}}><i {{bindAttr class="option.cssClass option.liClass"}}></i> {{option.label}}
+ </a>
+ </li>
+ {{/each}}
+ {{#if view.clients}}
+ <li class="dropdown-submenu submenu-left">
+ <a><i class="icon-download-alt"></i> {{t services.service.actions.downloadClientConfigs}}</a>
+
+ <div class="dropdown-menu-wrap">
+ <ul class="dropdown-menu">
+ {{#each client in view.clientsWithConfigs}}
+ <li>
+ <a {{action "downloadClientConfigs" client target="controller" href=true}}>{{client.displayName}}</a>
+ </li>
+ {{/each}}
+ </ul>
+ </div>
+ </li>
+ {{/if}}
+ </ul>
+ </div>
</div>
+ {{/if}}
+ {{outlet}}
</div>
+ </div>
{{else}}
- <div class="spinner"></div>
+ <div class="spinner"></div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/main/service/all_services_actions.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/all_services_actions.hbs b/ambari-web/app/templates/main/service/all_services_actions.hbs
index e7dd68e..d17b519 100644
--- a/ambari-web/app/templates/main/service/all_services_actions.hbs
+++ b/ambari-web/app/templates/main/service/all_services_actions.hbs
@@ -23,7 +23,6 @@
<span class="caret"></span>
</a>
<ul class="pull-left dropdown-menu">
- {{#if App.supports.addServices}}
<li {{bindAttr class="controller.isAllServicesInstalled:disabled"}}>
<a href="#"
{{bindAttr class="controller.isAllServicesInstalled:disabled"}}
@@ -31,8 +30,6 @@
<i class="icon-plus icon-white"></i> {{t services.service.add}}</a>
</li>
<li class="divider"></li>
- {{/if}}
- {{#if App.supports.startStopAllServices}}
<li {{bindAttr class="controller.isStartAllDisabled:disabled" }}>
<a href="#" data-toggle="modal"
{{bindAttr class="controller.isStartAllDisabled:disabled" }}
@@ -49,7 +46,6 @@
{{t services.service.stopAll}}
</a>
</li>
- {{/if}}
</ul>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/main/service/info/configs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/configs.hbs b/ambari-web/app/templates/main/service/info/configs.hbs
index b4ec65c..267cd99 100644
--- a/ambari-web/app/templates/main/service/info/configs.hbs
+++ b/ambari-web/app/templates/main/service/info/configs.hbs
@@ -18,28 +18,33 @@
<div id="serviceConfig">
{{#if dataIsLoaded}}
- {{#if App.supports.hostOverrides}}
- {{#if controller.content.isRestartRequired}}
- {{#if App.isAdmin}}
- <div>
- <div class="alert alert-warning clearfix">
- <i class="icon-refresh"></i> {{t services.service.config.restartService.needToRestart}} <a href="#" {{action showComponentsShouldBeRestarted target="controller"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}} <a href="#" {{action showHostsShouldBeRestarted target="controller"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
- <span class="restart-components pull-right"> </span>
- <div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
- {{t hosts.host.details.needToRestart.button}}
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- <li><a href="#" {{action restartAllStaleConfigComponents target="controller"}}>{{t restart.service.all}}</a></li>
- {{#if view.rollingRestartSlaveComponentName}}
- <li><a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="controller"}}>{{view.rollingRestartActionName}}</a></li>
- {{/if}}
- </ul>
- </div>
+ {{#if controller.content.isRestartRequired}}
+ {{#if App.isAdmin}}
+ <div>
+ <div class="alert alert-warning clearfix">
+ <i class="icon-refresh"></i> {{t services.service.config.restartService.needToRestart}} <a
+ href="#" {{action showComponentsShouldBeRestarted target="controller"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}}
+ <a href="#" {{action showHostsShouldBeRestarted target="controller"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
+ <span class="restart-components pull-right"> </span>
+
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
+ {{t hosts.host.details.needToRestart.button}}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li>
+ <a href="#" {{action restartAllStaleConfigComponents target="controller"}}>{{t restart.service.all}}</a>
+ </li>
+ {{#if view.rollingRestartSlaveComponentName}}
+ <li>
+ <a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="controller"}}>{{view.rollingRestartActionName}}</a>
+ </li>
+ {{/if}}
+ </ul>
</div>
</div>
- {{/if}}
+ </div>
{{/if}}
{{/if}}
<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/main/service/info/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs
index 080a3f7..6084484 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -16,28 +16,31 @@
* limitations under the License.
}}
-{{#if App.supports.hostOverrides}}
- {{#if view.service.isRestartRequired}}
- {{#if App.isAdmin}}
- <div id="summary-restart-bar">
- <div class="alert alert-warning clearfix">
- <i class="icon-refresh"></i> {{{view.needToRestartMessage}}} {{t services.service.config.restartService.needToRestart}} <a href="#" {{action showComponentsShouldBeRestarted target="view"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}} <a href="#" {{action showHostsShouldBeRestarted target="view"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
- <span class="restart-components pull-right"> </span>
- <div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
- {{t hosts.host.details.needToRestart.button}}
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu">
- <li><a href="#" {{action restartAllStaleConfigComponents target="view"}}>{{t restart.service.all}}</a></li>
- {{#if view.rollingRestartSlaveComponentName}}
- <li><a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="view"}}>{{view.rollingRestartActionName}}</a></li>
- {{/if}}
- </ul>
- </div>
+{{#if view.service.isRestartRequired}}
+ {{#if App.isAdmin}}
+ <div id="summary-restart-bar">
+ <div class="alert alert-warning clearfix">
+ <i class="icon-refresh"></i> {{{view.needToRestartMessage}}} {{t services.service.config.restartService.needToRestart}}
+ <a href="#" {{action showComponentsShouldBeRestarted target="view"}}>{{view.componentsCount}} {{pluralize view.componentsCount singular="t:common.component" plural="t:common.components"}}</a> {{t on}}
+ <a href="#" {{action showHostsShouldBeRestarted target="view"}}>{{view.hostsCount}} {{pluralize view.hostsCount singular="t:common.host" plural="t:common.hosts"}}</a>
+ <span class="restart-components pull-right"> </span>
+
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-warning" data-toggle="dropdown">
+ {{t hosts.host.details.needToRestart.button}}
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="#" {{action restartAllStaleConfigComponents target="view"}}>{{t restart.service.all}}</a></li>
+ {{#if view.rollingRestartSlaveComponentName}}
+ <li>
+ <a href="#" {{action rollingRestartStaleConfigSlaveComponents view.rollingRestartSlaveComponentName target="view"}}>{{view.rollingRestartActionName}}</a>
+ </li>
+ {{/if}}
+ </ul>
</div>
</div>
- {{/if}}
+ </div>
{{/if}}
{{/if}}
@@ -50,9 +53,9 @@
<div class="service-content">
<table id="summary-info" class="table no-borders table-condensed">
<tbody>
- {{#if view.serviceSummaryView}}
- {{view view.serviceSummaryView}}
- {{/if}}
+ {{#if view.serviceSummaryView}}
+ {{view view.serviceSummaryView}}
+ {{/if}}
</tbody>
</table>
</div>
@@ -66,7 +69,8 @@
{{#if controller.isNagiosInstalled}}
<div class="btn-group">
{{#if App.router.clusterController.isNagiosUrlLoaded}}
- <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a>
+ <a class="btn" target="_blank" rel="tooltip"
+ title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a>
{{else}}
<div class="spinner"></div>
{{/if}}
@@ -106,13 +110,15 @@
<div {{bindAttr class=":accordion collapsedSection.toggleIndex"}}>
<div class="accordion-group box">
<div class="accordion-heading box-header">
- <span class="pull-left accordion-toggle" data-toggle="collapse" {{bindAttr dataParent="collapsedSection.toggleIndex" href="collapsedSection.toggleIndex"}}>
+ <span class="pull-left accordion-toggle"
+ data-toggle="collapse" {{bindAttr dataParent="collapsedSection.toggleIndex" href="collapsedSection.toggleIndex"}}>
<i class="pull-left icon-caret-toggle"></i>
<span>{{collapsedSection.header}}</span>
</span>
<a class="btn pull-right" {{bindAttr href="collapsedSection.url"}} target="_blank">
<i class="icon-link"></i>
</a>
+
<div class="clearfix"></div>
</div>
<div class="accordion-body collapse in" {{bindAttr id="collapsedSection.id"}}>
@@ -130,38 +136,41 @@
{{/if}}
{{#if view.serviceMetricGraphs.length}}
-<div class="row-fluid">
- <div class="span12">
- <div class="box">
- <div class="box-header">
- <h4>{{controller.content.displayName}} {{t services.service.metrics}}</h4>
- {{#if controller.isGangliaInstalled}}
- <div class="btn-group">
- {{#if App.router.clusterController.isGangliaUrlLoaded}}
- <a class="btn" target="_blank" rel="tooltip" title="Go to Ganglia" {{bindAttr href="view.gangliaUrl"}}><i class="icon-link"></i></a>
- {{else}}
- <div class="spinner"></div>
- {{/if}}
- </div>
- {{/if}}
- </div>
+ <div class="row-fluid">
+ <div class="span12">
+ <div class="box">
+ <div class="box-header">
+ <h4>{{controller.content.displayName}} {{t services.service.metrics}}</h4>
+ {{#if controller.isGangliaInstalled}}
+ <div class="btn-group">
+ {{#if App.router.clusterController.isGangliaUrlLoaded}}
+ <a class="btn" target="_blank" rel="tooltip"
+ title="Go to Ganglia" {{bindAttr href="view.gangliaUrl"}}><i class="icon-link"></i></a>
+ {{else}}
+ <div class="spinner"></div>
+ {{/if}}
+ </div>
+ {{/if}}
+ </div>
+
+ <div class="">
+ <table class="graphs">
+ {{#each graphs in view.serviceMetricGraphs}}
+ <tr>
+ {{#each graph in graphs}}
+ <td>
+ <div class="">
+ {{view graph}}
+ </div>
+ </td>
+ {{/each}}
+ </tr>
+ {{/each}}
+ </table>
+ </div>
- <div class="">
- <table class="graphs">
- {{#each graphs in view.serviceMetricGraphs}}
- <tr>
- {{#each graph in graphs}}
- <td>
- <div class="">
- {{view graph}}
- </div>
- </td>
- {{/each}}
- </tr>
- {{/each}}
- </table>
</div>
-
+
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/wizard/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs
index b1e323f..63aeaa0 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -26,95 +26,94 @@
{{/each}}
</form>
-{{#if App.supports.localRepositories}}
- <div class="accordion" id="advancedRepoAccordion">
- <div class="accordion-group">
- <div class="accordion-heading" {{action "onToggleBlock" target="view"}}>
- <i {{bindAttr class=":pull-left :accordion-toggle view.isRLCollapsed:icon-caret-right:icon-caret-down"}}></i>
- <a class="accordion-toggle">
- {{t installer.step1.advancedRepo.title}}
- {{#if view.isSubmitDisabled}}
- <span class="badge badge-important">{{view.totalErrorCnt}}</span>
- {{/if}}
- </a>
- </div>
- <div class="accordion-body collapse in">
- <div class="accordion-inner">
- <div class="alert alert-info">{{t installer.step1.advancedRepo.message}}</div>
- <div class="alert alert-warning">{{t installer.step1.advancedRepo.importantMassage}}</div>
+<div class="accordion" id="advancedRepoAccordion">
+ <div class="accordion-group">
+ <div class="accordion-heading" {{action "onToggleBlock" target="view"}}>
+ <i {{bindAttr class=":pull-left :accordion-toggle view.isRLCollapsed:icon-caret-right:icon-caret-down"}}></i>
+ <a class="accordion-toggle">
+ {{t installer.step1.advancedRepo.title}}
+ {{#if view.isSubmitDisabled}}
+ <span class="badge badge-important">{{view.totalErrorCnt}}</span>
+ {{/if}}
+ </a>
- <div class="repositories-table">
- <div class="thead">
- <div class="first-th"> </div>
- <div class="th os-th">{{t common.os}}</div>
- <div class="th name-th">{{t common.name}}</div>
- <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
- </div>
- <div class="tbody">
- {{#each operatingSystem in view.operatingSystems}}
- <div class="trow">
- <div class="os-td">
- <label>
- {{view Ember.Checkbox checkedBinding="operatingSystem.isSelected"}}
- <span {{bindAttr class=":os operatingSystem.isSelected::disabled-label"}}>{{operatingSystem.osType}}</span>
- </label>
- </div>
- <div style="width:83%">
- {{#each repository in operatingSystem.repositories}}
- <div class="sub-trow">
- <div class="name-td">{{repository.repoId}}</div>
- <div class="validation-td">
- {{#if repository.validation}}
- {{view view.popoverView repositoryBinding="repository"}}
- {{/if}}
- </div>
- <div {{bindAttr class=":url-td operatingSystem.isSelected::disabled-textfield repository.emptyError:textfield-error repository.invalidError:textfield-error"}}>
- {{view Ember.TextField valueBinding="repository.baseUrl"}}
- </div>
- <div class="clear-td">
- {{#if repository.clearAll}}
- <a {{action "clearGroupLocalRepository" repository target="view" }}>
- <i class="icon-remove-sign"></i>
- </a>
- {{/if}}
- </div>
- <div class="actions-td">
- {{#if repository.undo}}
- <a {{action "undoGroupLocalRepository" repository target="view" }}>
- <i class="icon-undo"></i>{{t common.undo}}
- </a>
- {{/if}}
- </div>
- </div>
- {{/each}}
- </div>
- </div>
- {{/each}}
- </div>
+ </div>
+ <div class="accordion-body collapse in">
+ <div class="accordion-inner">
+ <div class="alert alert-info">{{t installer.step1.advancedRepo.message}}</div>
+ <div class="alert alert-warning">{{t installer.step1.advancedRepo.importantMassage}}</div>
+
+ <div class="repositories-table">
+ <div class="thead">
+ <div class="first-th"> </div>
+ <div class="th os-th">{{t common.os}}</div>
+ <div class="th name-th">{{t common.name}}</div>
+ <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
</div>
- <div id="skip-validation">
- <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}
- <i class="icon-question-sign" rel="skip-validation-tooltip"
- data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
+ <div class="tbody">
+ {{#each operatingSystem in view.operatingSystems}}
+ <div class="trow">
+ <div class="os-td">
+ <label>
+ {{view Ember.Checkbox checkedBinding="operatingSystem.isSelected"}}
+ <span {{bindAttr class=":os operatingSystem.isSelected::disabled-label"}}>{{operatingSystem.osType}}</span>
+ </label>
+ </div>
+ <div style="width:83%">
+ {{#each repository in operatingSystem.repositories}}
+ <div class="sub-trow">
+ <div class="name-td">{{repository.repoId}}</div>
+ <div class="validation-td">
+ {{#if repository.validation}}
+ {{view view.popoverView repositoryBinding="repository"}}
+ {{/if}}
+ </div>
+ <div {{bindAttr class=":url-td operatingSystem.isSelected::disabled-textfield repository.emptyError:textfield-error repository.invalidError:textfield-error"}}>
+ {{view Ember.TextField valueBinding="repository.baseUrl"}}
+ </div>
+ <div class="clear-td">
+ {{#if repository.clearAll}}
+ <a {{action "clearGroupLocalRepository" repository target="view" }}>
+ <i class="icon-remove-sign"></i>
+ </a>
+ {{/if}}
+ </div>
+ <div class="actions-td">
+ {{#if repository.undo}}
+ <a {{action "undoGroupLocalRepository" repository target="view" }}>
+ <i class="icon-undo"></i>{{t common.undo}}
+ </a>
+ {{/if}}
+ </div>
+ </div>
+ {{/each}}
+ </div>
+ </div>
+ {{/each}}
</div>
- {{#if view.emptyRepoExist}}
- <div class="alert">{{t installer.step1.attentionNeeded}}</div>
- {{/if}}
- {{#if view.invalidUrlExist}}
- <div class="alert">
- {{t installer.step1.invalidURLAttention}}
- <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a>
- </div>
- {{/if}}
- {{#if view.allRepoUnchecked}}
- <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div>
- {{/if}}
</div>
+ <div id="skip-validation">
+ <label>{{view Ember.Checkbox checkedBinding="skipValidationChecked" class="checkbox"}}{{t installer.step1.advancedRepo.skipValidation.message}}
+ <i class="icon-question-sign" rel="skip-validation-tooltip"
+ data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
+ </div>
+ {{#if view.emptyRepoExist}}
+ <div class="alert">{{t installer.step1.attentionNeeded}}</div>
+ {{/if}}
+ {{#if view.invalidUrlExist}}
+ <div class="alert">
+ {{t installer.step1.invalidURLAttention}}
+ <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a>
+ </div>
+ {{/if}}
+ {{#if view.allRepoUnchecked}}
+ <div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div>
+ {{/if}}
</div>
</div>
</div>
-{{/if}}
+</div>
<a class="btn pull-left" {{action back}}>← {{t common.back}}</a>
<button class="btn btn-success pull-right" {{bindAttr disabled="view.isSubmitDisabled"}} {{action next}}>{{t common.next}} →</button>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/templates/wizard/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step2.hbs b/ambari-web/app/templates/wizard/step2.hbs
index 553c8e3..7d1b22a 100644
--- a/ambari-web/app/templates/wizard/step2.hbs
+++ b/ambari-web/app/templates/wizard/step2.hbs
@@ -99,22 +99,6 @@
</div>
</div>
- <div class="advancedOptions">
- {{#unless App.supports.localRepositories}}
- <h5>{{t installer.step2.advancedOptions.header}}</h5>
- <label {{bindAttr class=":checkbox"}}>
- {{view Ember.Checkbox checkedBinding="content.installOptions.localRepo"}}
-
- {{t installer.step2.localRepo.label_use}}
-
- <a href="javascript:void(null)"
- rel="popover"
- {{translateAttr title="installer.step2.localRepo.tooltip.title" data-content="installer.step2.localRepo.tooltip.content"}}>
- {{t installer.step2.localRepo.tooltip.title}}</a>
- {{t installer.step2.localRepo.label_instead}}
- </label>
- {{/unless}}
- </div>
<div class="btn-area">
{{#unless view.parentView.controller.hideBackButton}}
<a class="btn pull-left" {{action back}}>← {{t common.back}}</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 75eda91..72226c5 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -164,12 +164,6 @@ App.config = Em.Object.create({
//configs with these filenames go to appropriate category not in Advanced
customFileNames: function () {
var customFiles = ['flume-conf.xml'];
- if (App.get('supports.capacitySchedulerUi')) {
- if (App.get('isHadoop2Stack')) {
- return customFiles.concat(['capacity-scheduler.xml']);
- }
- return customFiles.concat(['capacity-scheduler.xml', 'mapred-queue-acls.xml']);
- }
return customFiles;
}.property('App.isHadoop2Stack'),
@@ -628,12 +622,6 @@ App.config = Em.Object.create({
var stored = configs.filter(function (_config) {
return this.get('categoriesWithCustom').contains(_config.category);
}, this);
- if (App.get('supports.capacitySchedulerUi')) {
- var queueProperties = stored.filter(this.get('capacitySchedulerFilter'));
- if (queueProperties.length) {
- queueProperties.setEach('isQueue', true);
- }
- }
},
miscConfigVisibleProperty: function (configs, serviceToShow) {
@@ -697,55 +685,23 @@ App.config = Em.Object.create({
// Use calculated default values for some configs
var recommendedDefaults = {};
- if (App.get('supports.serverRecommendValidate')) {
- if (!storedConfigs && service.get('configTypes')) {
- Object.keys(service.get('configTypes')).forEach(function (type) {
- if (!recommended || !recommended[type]) {
- return;
- }
- var defaults = recommended[type].properties;
- for (var name in defaults) {
- var config = configsByService.findProperty('name', name);
- if (!config) {
- continue;
- }
- recommendedDefaults[name] = defaults[name];
- config.set('value', defaults[name]);
- config.set('defaultValue', defaults[name]);
- }
- });
- }
- } else {
- if (!storedConfigs && service.get('defaultsProviders')) {
- service.get('defaultsProviders').forEach(function (defaultsProvider) {
- var defaults = defaultsProvider.getDefaults(localDB);
- for (var name in defaults) {
- var config = configsByService.findProperty('name', name);
- if (!config) {
- continue;
- }
- if (!!defaults[name]) {
- recommendedDefaults[name] = defaults[name];
- config.set('value', defaults[name]);
- config.set('defaultValue', defaults[name]);
- } else {
- recommendedDefaults[name] = config.get('defaultValue');
- }
- }
- });
- }
- if (service.get('configsValidator')) {
- service.get('configsValidator').set('recommendedDefaults', recommendedDefaults);
- var validators = service.get('configsValidator').get('configValidators');
- for (var validatorName in validators) {
- var c = configsByService.findProperty('name', validatorName);
- if (c) {
- c.set('serviceValidator', service.get('configsValidator'));
+ if (!storedConfigs && service.get('configTypes')) {
+ Object.keys(service.get('configTypes')).forEach(function (type) {
+ if (!recommended || !recommended[type]) {
+ return;
+ }
+ var defaults = recommended[type].properties;
+ for (var name in defaults) {
+ var config = configsByService.findProperty('name', name);
+ if (!config) {
+ continue;
}
+ recommendedDefaults[name] = defaults[name];
+ config.set('value', defaults[name]);
+ config.set('defaultValue', defaults[name]);
}
- }
+ });
}
-
serviceConfig.set('configs', configsByService);
renderedServiceConfigs.push(serviceConfig);
}, this);
@@ -808,17 +764,6 @@ App.config = Em.Object.create({
configs: [],
configGroups: []
});
- serviceConfig.configCategories.filterProperty('isCustomView', true).forEach(function (category) {
- switch (category.name) {
- case 'CapacityScheduler':
- if (App.get('supports.capacitySchedulerUi')) {
- category.set('customView', App.ServiceConfigCapacityScheduler);
- } else {
- category.set('isCustomView', false);
- }
- break;
- }
- }, this);
return serviceConfig;
},
/**
@@ -922,12 +867,12 @@ App.config = Em.Object.create({
var fileName = item.type;
var isHDP2 = App.get('isHadoop2Stack');
/**
- * Properties from mapred-queue-acls.xml are ignored unless App.supports.capacitySchedulerUi is true
+ * Properties from mapred-queue-acls.xml are ignored
* Properties from capacity-scheduler.xml are ignored unless HDP stack version is 2.x or
- * HDP stack version is 1.x and App.supports.capacitySchedulerUi is true.
+ * HDP stack version is 1.x
*/
- if ((fileName !== 'mapred-queue-acls.xml' || App.get('supports.capacitySchedulerUi')) &&
- (fileName !== 'capacity-scheduler.xml' || isHDP2 || App.get('supports.capacitySchedulerUi'))) {
+ if (fileName !== 'mapred-queue-acls.xml' &&
+ (fileName !== 'capacity-scheduler.xml' || isHDP2)) {
var property = {
serviceName: serviceName,
name: item.property_name,
@@ -1363,12 +1308,10 @@ App.config = Em.Object.create({
persistWizardStep7ConfigGroups: function () {
var installerController = App.router.get('installerController');
var step7Controller = App.router.get('wizardStep7Controller');
- if (App.get('supports.hostOverridesInstaller')) {
installerController.saveServiceConfigGroups(step7Controller, step7Controller.get('content.controllerName') == 'addServiceController');
App.clusterStatus.setClusterStatus({
localdb: App.db.data
});
- }
},
/**
* exclude configs that depends on services which are uninstalled
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index b9e7b6a..e353fa6 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -357,9 +357,7 @@ App.HostPopup = Em.Object.create({
updatedService = this.createService(service);
servicesInfo.insertAt(index, updatedService);
}
- if (App.get('supports.abortRequests')) {
- updatedService.set('isAbortable', this.isAbortableByStatus(service.status));
- }
+ updatedService.set('isAbortable', this.isAbortableByStatus(service.status));
}, this);
this.removeOldServices(servicesInfo, currentServices);
this.setBackgroundOperationHeader(isServiceListHidden);
@@ -600,13 +598,12 @@ App.HostPopup = Em.Object.create({
self.set('previousServiceId', this.get('currentServiceId'));
}
}
- if (App.get('supports.abortRequests')) {
- var operation = this.get('servicesInfo').findProperty('name', this.get('serviceName'));
- if (!operation || (operation && operation.get('progress') == 100)) {
- this.set('operationInfo', null);
- } else {
- this.set('operationInfo', operation);
- }
+
+ var operation = this.get('servicesInfo').findProperty('name', this.get('serviceName'));
+ if (!operation || (operation && operation.get('progress') == 100)) {
+ this.set('operationInfo', null);
+ } else {
+ this.set('operationInfo', operation);
}
},
@@ -657,9 +654,9 @@ App.HostPopup = Em.Object.create({
headerClass: Em.View.extend({
controller: this,
template: Ember.Handlebars.compile('{{popupHeaderName}} ' +
- '{{#if App.supports.abortRequests}}{{#unless view.parentView.isHostListHidden}}{{#if controller.operationInfo.isAbortable}}' +
+ '{{#unless view.parentView.isHostListHidden}}{{#if controller.operationInfo.isAbortable}}' +
'{{view controller.abortIcon servicesInfoBinding="controller.operationInfo"}}' +
- '{{/if}}{{/unless}}{{/if}}')
+ '{{/if}}{{/unless}}')
}),
/**
@@ -957,9 +954,7 @@ App.HostPopup = Em.Object.create({
this.set("parentView.isHostListHidden", false);
this.set("parentView.isTaskListHidden", true);
this.get("controller").set("popupHeaderName", this.get("controller.serviceName"));
- if (App.get('supports.abortRequests')) {
- this.get("controller").set("operationInfo", this.get('controller.servicesInfo').findProperty('name', this.get('controller.serviceName')));
- }
+ this.get("controller").set("operationInfo", this.get('controller.servicesInfo').findProperty('name', this.get('controller.serviceName')));
this.switchLevel("HOSTS_LIST");
},
@@ -1006,9 +1001,8 @@ App.HostPopup = Em.Object.create({
this.switchLevel("HOSTS_LIST");
var servicesInfo = this.get("controller.hosts");
this.set("controller.popupHeaderName", event.context.get("name"));
- if (App.get('supports.abortRequests')) {
- this.set("controller.operationInfo", event.context);
- }
+ this.set("controller.operationInfo", event.context);
+
//apply lazy loading on cluster with more than 100 nodes
if (servicesInfo.length > 100) {
this.set('hosts', servicesInfo.slice(0, 50));
http://git-wip-us.apache.org/repos/asf/ambari/blob/33ed5921/ambari-web/app/views.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views.js b/ambari-web/app/views.js
index 2766539..1970248 100644
--- a/ambari-web/app/views.js
+++ b/ambari-web/app/views.js
@@ -246,11 +246,6 @@ require('views/main/apps_view');
require('views/main/apps/item_view');
require('views/main/apps/item/bar_view');
require('views/main/apps/item/dag_view');
-require('views/main/mirroring_view');
-require('views/main/mirroring/edit_dataset_view');
-require('views/main/mirroring/datasets_view');
-require('views/main/mirroring/jobs_view');
-require('views/main/mirroring/manage_clusters_view');
require('views/main/views_view');