AMBARI-13198 Unneeded buttons on the Service Configs page. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f7e29cd7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f7e29cd7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f7e29cd7 Branch: refs/heads/trunk Commit: f7e29cd78e004fb13aeb20283bbc950369ddb0d5 Parents: e24e3c8 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Wed Sep 23 11:39:13 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Wed Sep 23 11:45:00 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 2 -- .../app/templates/common/configs/service_config.hbs | 2 +- ambari-web/app/templates/main/service/info/configs.hbs | 12 +----------- .../app/views/common/configs/service_config_view.js | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f7e29cd7/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 05d66c7..db5f1ed 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -125,8 +125,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A return App.config.get('preDefinedServiceConfigs'); }.property('App.config.preDefinedServiceConfigs'), - showConfigHistoryFeature: true, - /** * Number of errors in the configs in the selected service (only for AdvancedTab if App supports Enhanced Configs) * @type {number} http://git-wip-us.apache.org/repos/asf/ambari/blob/f7e29cd7/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 f819fe0..72c7c35 100644 --- a/ambari-web/app/templates/common/configs/service_config.hbs +++ b/ambari-web/app/templates/common/configs/service_config.hbs @@ -84,7 +84,7 @@ </div> {{/if}} -{{#if view.showConfigHistoryFeature}} +{{#if view.isOnTheServicePage}} {{#if allVersionsLoaded}} {{view App.ConfigHistoryFlowView serviceBinding="selectedService"}} {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/f7e29cd7/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 5a60f91..0ffad28 100644 --- a/ambari-web/app/templates/main/service/info/configs.hbs +++ b/ambari-web/app/templates/main/service/info/configs.hbs @@ -48,17 +48,7 @@ {{/isAccessible}} {{/if}} <div class="clearfix"></div> - {{view App.ServiceConfigView filterBinding="controller.filter" columnsBinding="controller.filterColumns" canEditBinding="controller.canEdit" showConfigHistoryFeatureBinding="controller.showConfigHistoryFeature"}} - {{#isAccessible ADMIN}} - {{#unless showConfigHistoryFeature}} - <p class="pull-right"> - <!--<input class="btn btn-primary" type="button" value="Save" {{!bindAttr disabled="isSubmitDisabled"}} />--> - <a class="btn" {{action doCancel target="controller"}}>{{t common.cancel}}</a> - <a class="btn btn-primary" {{bindAttr disabled="isSubmitDisabled"}} - {{action saveStepConfigs target="controller"}}>{{t common.save}}</a> - </p> - {{/unless}} - {{/isAccessible}} + {{view App.ServiceConfigView filterBinding="controller.filter" columnsBinding="controller.filterColumns" canEditBinding="controller.canEdit"}} {{else}} <div class="spinner"></div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/f7e29cd7/ambari-web/app/views/common/configs/service_config_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/service_config_view.js b/ambari-web/app/views/common/configs/service_config_view.js index 016b546..5ad5c2e 100644 --- a/ambari-web/app/views/common/configs/service_config_view.js +++ b/ambari-web/app/views/common/configs/service_config_view.js @@ -114,8 +114,6 @@ App.ServiceConfigView = Em.View.extend({ } }.property('controller.name', 'controller.selectedService'), - showConfigHistoryFeature: false, - toggleRestartMessageView: function () { this.$('.service-body').toggle('blind', 200); this.set('isRestartMessageCollapsed', !this.get('isRestartMessageCollapsed'));