AMBARI-8205. Configs: Dashboard > Config History remove custom date option (alexantonenko)

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){

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",