AMBARI-8205. Configs: Dashboard > Config History remove custom date option (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ecdf63e9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ecdf63e9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ecdf63e9 Branch: refs/heads/branch-1.7.0 Commit: ecdf63e9cf7ec431c035787f3ae457133350b5d0 Parents: 007d343 Author: Alex Antonenko <hiv...@gmail.com> Authored: Fri Nov 7 17:51:08 2014 +0200 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Fri Nov 7 19:30:32 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/routes/add_service_routes.js | 16 ++++++++-------- .../app/views/main/dashboard/config_history_view.js | 8 +------- 2 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ecdf63e9/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 4faed5e..c6daaf0 100644 --- a/ambari-web/app/routes/add_service_routes.js +++ b/ambari-web/app/routes/add_service_routes.js @@ -188,14 +188,14 @@ module.exports = App.WizardRoute.extend({ var controller = router.get('addServiceController'); controller.setCurrentStep('4'); controller.dataLoading().done(function () { - controller.usersLoading().done(function () { - var wizardStep7Controller = router.get('wizardStep7Controller'); - controller.loadAllPriorSteps(); - controller.loadAdvancedConfigs(wizardStep7Controller); - wizardStep7Controller.getConfigTags(); - wizardStep7Controller.set('wizardController', controller); - controller.connectOutlet('wizardStep7', controller.get('content')); - }); + var wizardStep7Controller = router.get('wizardStep7Controller'); + controller.loadAllPriorSteps(); + controller.loadAdvancedConfigs(wizardStep7Controller); + wizardStep7Controller.getConfigTags(); + wizardStep7Controller.set('wizardController', controller); + controller.usersLoading().done(function () { + controller.connectOutlet('wizardStep7', controller.get('content')); + }); }) }, back: function(router){ http://git-wip-us.apache.org/repos/asf/ambari/blob/ecdf63e9/ambari-web/app/views/main/dashboard/config_history_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/config_history_view.js b/ambari-web/app/views/main/dashboard/config_history_view.js index a866ae9..1f1d0b3 100644 --- a/ambari-web/app/views/main/dashboard/config_history_view.js +++ b/ambari-web/app/views/main/dashboard/config_history_view.js @@ -149,15 +149,9 @@ App.MainConfigHistoryView = App.TableView.extend({ modifiedFilterView: filters.createSelectView({ column: 3, - triggeredOnSameValue: [ - { - values: ['Custom', 'Custom2'], - displayAs: 'Custom' - } - ], appliedEmptyValue: ["", ""], fieldType: 'filter-input-width,modified-filter', - content: ['Any', 'Past 1 hour', 'Past 1 Day', 'Past 2 Days', 'Past 7 Days', 'Past 14 Days', 'Past 30 Days', 'Custom', 'Custom2'], + content: ['Any', 'Past 1 hour', 'Past 1 Day', 'Past 2 Days', 'Past 7 Days', 'Past 14 Days', 'Past 30 Days'], valueBinding: "controller.modifiedFilter.optionValue", startTimeBinding: "controller.modifiedFilter.actualValues.startTime", endTimeBinding: "controller.modifiedFilter.actualValues.endTime",
