ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [2/3] ambari git commit: AMBARI-8205. Configs: Dashboard > Config History remove custom date option (alexantonenko)
Date Fri, 07 Nov 2014 17:29:53 GMT
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/b1c4853a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1c4853a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1c4853a

Branch: refs/heads/trunk
Commit: b1c4853a61edd2a87977077d065356ea419ca3b3
Parents: cd3b01a
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Fri Nov 7 17:13:51 2014 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Nov 7 19:29:44 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/b1c4853a/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 5a1dd92..8c1326e 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/b1c4853a/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",


Mime
View raw message