Updated Branches: refs/heads/trunk e6e7ec1f9 -> 1536c7a58
AMBARI-3885 Connect config filter to config group tab. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1536c7a5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1536c7a5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1536c7a5 Branch: refs/heads/trunk Commit: 1536c7a58282438df8326ae101e2fe643c758d52 Parents: e6e7ec1 Author: atkach <[email protected]> Authored: Tue Nov 26 15:30:09 2013 +0200 Committer: atkach <[email protected]> Committed: Tue Nov 26 15:30:09 2013 +0200 ---------------------------------------------------------------------- .../app/controllers/wizard/step7_controller.js | 20 ++++++++++++++++++++ .../common/configs/services_config.hbs | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1536c7a5/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index f1f1f8f..c0c5617 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -84,6 +84,8 @@ App.WizardStep7Controller = Em.Controller.extend({ clearStep: function () { this.get('stepConfigs').clear(); + this.set('filter', ''); + this.get('filterColumns').setEach('selected', false); }, /** @@ -236,6 +238,24 @@ App.WizardStep7Controller = Em.Controller.extend({ manageConfigurationGroup: function () { App.router.get('mainServiceItemController').manageConfigurationGroups(this); }, + /** + * Filter text will be located here + */ + filter: '', + + /** + * Dropdown menu items in filter combobox + */ + filterColumns: function () { + var result = []; + for (var i = 1; i < 2; i++) { + result.push(Ember.Object.create({ + name: this.t('common.combobox.dropdown.' + i), + selected: false + })); + } + return result; + }.property(), /** * make some configs visible depending on active services */ http://git-wip-us.apache.org/repos/asf/ambari/blob/1536c7a5/ambari-web/app/templates/common/configs/services_config.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/services_config.hbs b/ambari-web/app/templates/common/configs/services_config.hbs index 790c6c4..516406f 100644 --- a/ambari-web/app/templates/common/configs/services_config.hbs +++ b/ambari-web/app/templates/common/configs/services_config.hbs @@ -28,7 +28,7 @@ {{/if}} {{/each}} </ul> -{{view App.ServiceConfigView isNotEditableBinding="controller.isNotEditable"}} +{{view App.ServiceConfigView isNotEditableBinding="controller.isNotEditable" filterBinding="controller.filter" columnsBinding="controller.filterColumns"}} {{#if isSubmitDisabled}} <div class="alert">{{t installer.step7.attentionNeeded}}</div> {{/if}} \ No newline at end of file
