ambari git commit: AMBARI-10215. Support config-groups functionality for enhanced-configs (onechiporenko)

2015-03-27 Thread onechiporenko
Repository: ambari
Updated Branches:
  refs/heads/trunk aae47bd59 - e2ea86f4f


AMBARI-10215. Support config-groups functionality for enhanced-configs 
(onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2ea86f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2ea86f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2ea86f4

Branch: refs/heads/trunk
Commit: e2ea86f4fa384a454ac9fcab4336ad29ef3556d9
Parents: aae47bd
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Mar 27 19:39:52 2015 +0200
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Mar 27 19:42:01 2015 +0200

--
 .../templates/common/configs/service_config_category.hbs  |  5 -
 .../common/configs/widgets/slider_config_widget.hbs   | 10 ++
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e2ea86f4/ambari-web/app/templates/common/configs/service_config_category.hbs
--
diff --git 
a/ambari-web/app/templates/common/configs/service_config_category.hbs 
b/ambari-web/app/templates/common/configs/service_config_category.hbs
index 0ab60c2..e7deefa 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -121,7 +121,10 @@
 span class=help-inline{{warnMessage}}/span
   /div
   {{#if this.isOverridden}}
-{{view App.ServiceConfigView.SCPOverriddenRowsView 
serviceConfigPropertyBinding=this 
isDefaultGroupSelectedBinding=controller.selectedConfigGroup.isDefault}}
+{{view App.ServiceConfigView.SCPOverriddenRowsView
+  serviceConfigPropertyBinding=this
+  
isDefaultGroupSelectedBinding=controller.selectedConfigGroup.isDefault
+}}
   {{/if}}
   {{#if this.isComparison}}
 {{view App.ServiceConfigView.SCPComparisonRowsView 
serviceConfigPropertyBinding=this}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/e2ea86f4/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
--
diff --git 
a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs 
b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
index 938359b..67f296a 100644
--- a/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/slider_config_widget.hbs
@@ -29,12 +29,14 @@
 {{/if}}
   /div
 /div
-{{view App.RestoreConfigView visibleBinding=view.undoAllowed}}
+{{#if view.config.isOriginalSCP}}
+  {{view App.RestoreConfigView visibleBinding=view.undoAllowed}}
+{{/if}}
 {{#if view.overrideAllowed}}
   {{#isAccessible ADMIN}}
 div class=pull-left action-button
   a class=btn btn-small href=# data-toggle=tooltip
-{{action createOverrideProperty view target=view.parentView}}
+{{action createOverrideProperty view.config 
target=view.parentView}}
 {{translateAttr data-original-title=common.override}}
 i class=icon-plus-sign/i
   /a
@@ -46,11 +48,11 @@
   div class=ui-slider-wrapper
 {{view Ember.TextField valueBinding=view.config.value class=input-mini 
slider-input}}
   /div
-  {{#if view.config.isOverridden}}
+  {{#if view.config.overrides.length}}
 {{view App.SliderConfigWidgetOverrideView
   serviceConfigPropertyBinding=view.config
   isDefaultGroupSelectedBinding=controller.selectedConfigGroup.isDefault
 }}
   {{/if}}
   div class=clearfix/div
-/div
+/div
\ No newline at end of file



ambari git commit: AMBARI-10215. Support config-groups functionality for enhanced-configs (onechiporenko)

2015-03-26 Thread onechiporenko
Repository: ambari
Updated Branches:
  refs/heads/trunk 65fe89c96 - 5d035d51e


AMBARI-10215. Support config-groups functionality for enhanced-configs 
(onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d035d51
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d035d51
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d035d51

Branch: refs/heads/trunk
Commit: 5d035d51e748975ee6c56567ae2d0b2a5c034d48
Parents: 65fe89c
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Thu Mar 26 13:27:22 2015 +0200
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Thu Mar 26 13:27:22 2015 +0200

--
 ambari-web/app/assets/test/tests.js |   1 +
 ambari-web/app/mixins.js|   1 +
 .../main/service/configs/config_overridable.js  |  59 +++
 ambari-web/app/styles/widgets.less  |  10 +-
 .../configs/service_config_layout_tab.hbs   |   5 +-
 .../overrides/slider_config_widget_override.hbs |  58 +++
 .../configs/widgets/slider_config_widget.hbs|  27 +++-
 ambari-web/app/views.js |   1 +
 .../common/configs/overriddenProperty_view.js   |   1 +
 .../configs/service_config_layout_tab_view.js   |  14 +-
 .../configs/service_configs_by_category_view.js |  38 +
 .../configs/widgets/config_widget_view.js   |  27 +++-
 .../slider_config_widget_override_view.js   |  25 +++
 .../widgets/slider_config_widget_view.js|  17 +++
 .../configs/widgets/config_widget_view_test.js  | 152 +++
 .../widgets/slider_config_widget_view_test.js   |  10 ++
 16 files changed, 395 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d035d51/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index afb170c..6267af3 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -165,6 +165,7 @@ var files = ['test/init_model_test',
   'test/utils/ui_effects_test',
   'test/utils/updater_test',
   'test/views/common/chart/linear_time_test',
+  'test/views/common/configs/widgets/config_widget_view_test',
   'test/views/common/configs/widgets/list_config_widget_view_test',
   'test/views/common/configs/widgets/slider_config_widget_view_test',
   'test/views/common/ajax_default_error_popup_body_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d035d51/ambari-web/app/mixins.js
--
diff --git a/ambari-web/app/mixins.js b/ambari-web/app/mixins.js
index 2b46a2a..7517c0d 100644
--- a/ambari-web/app/mixins.js
+++ b/ambari-web/app/mixins.js
@@ -26,6 +26,7 @@ require('mixins/common/serverValidator');
 require('mixins/common/table_server_view_mixin');
 require('mixins/common/table_server_mixin');
 require('mixins/main/host/details/host_components/decommissionable');
+require('mixins/main/service/configs/config_overridable');
 require('mixins/routers/redirections');
 require('mixins/wizard/wizardProgressPageController');
 require('mixins/wizard/wizardDeployProgressController');

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d035d51/ambari-web/app/mixins/main/service/configs/config_overridable.js
--
diff --git a/ambari-web/app/mixins/main/service/configs/config_overridable.js 
b/ambari-web/app/mixins/main/service/configs/config_overridable.js
new file mode 100644
index 000..7454a7f
--- /dev/null
+++ b/ambari-web/app/mixins/main/service/configs/config_overridable.js
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+
+App.ConfigOverridable = Em.Mixin.create({
+
+  /**
+   *
+   * @method createOverrideProperty
+   */
+  createOverrideProperty: function (event) {
+var serviceConfigProperty = event.contexts[0];
+var